diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:11:53 +0000 |
| commit | 7ea46a9866101f15734b557d812bb52d347f63fb (patch) | |
| tree | c752e2f04dab642e8b3d8d026dd530a7d4c1f229 /jest.config.base.js | |
| parent | 889bf7a0eea1f4ac7c2ec28cdfded399c0ca8fb9 (diff) | |
| download | gitlab-ce-7ea46a9866101f15734b557d812bb52d347f63fb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.base.js')
| -rw-r--r-- | jest.config.base.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jest.config.base.js b/jest.config.base.js index 4e9b84d1d34..745a179af6d 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -45,7 +45,8 @@ module.exports = (path) => { 'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json', '^spec/test_constants$': '<rootDir>/spec/frontend/__helpers__/test_constants', '^jest/(.*)$': '<rootDir>/spec/frontend/$1', - 'test_helpers(/.*)$': '<rootDir>/spec/frontend_integration/test_helpers$1', + '^test_helpers(/.*)$': '<rootDir>/spec/frontend_integration/test_helpers$1', + '^ee_else_ce_test_helpers(/.*)$': '<rootDir>/spec/frontend_integration/test_helpers$1', }; const collectCoverageFrom = ['<rootDir>/app/assets/javascripts/**/*.{js,vue}']; @@ -56,6 +57,7 @@ module.exports = (path) => { '^ee(/.*)$': rootDirEE, '^ee_component(/.*)$': rootDirEE, '^ee_else_ce(/.*)$': rootDirEE, + '^ee_else_ce_test_helpers(/.*)$': '<rootDir>/ee/spec/frontend_integration/test_helpers$1', '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1', [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures-ee$1', }); |