diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 15:06:38 +0000 |
| commit | 5ecacec30458330df5fa6d591dc58e37afb41cd4 (patch) | |
| tree | 58a9c004fdae78cbedbcc616dcfa783a1172eea3 /jest.config.js | |
| parent | 0d46bf06388d485824bc2f1e736b92b2a8a397e4 (diff) | |
| download | gitlab-ce-5ecacec30458330df5fa6d591dc58e37afb41cd4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.js')
| -rw-r--r-- | jest.config.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jest.config.js b/jest.config.js index 435dca876ce..c2a512e8afa 100644 --- a/jest.config.js +++ b/jest.config.js @@ -15,7 +15,10 @@ if (process.env.CI) { ]); } -let testMatch = ['<rootDir>/spec/frontend/**/*_spec.js', '<rootDir>/ee/spec/frontend/**/*_spec.js']; +let testMatch = ['<rootDir>/spec/frontend/**/*_spec.js']; +if (IS_EE) { + testMatch.push('<rootDir>/ee/spec/frontend/**/*_spec.js'); +} // workaround for eslint-import-resolver-jest only resolving in test files // see https://github.com/JoinColony/eslint-import-resolver-jest#note |