diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /jest.config.base.js | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
| download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'jest.config.base.js')
| -rw-r--r-- | jest.config.base.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jest.config.base.js b/jest.config.base.js index d1478987fb8..f2a7422303d 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -51,6 +51,7 @@ module.exports = (path, options = {}) => { '^shared_queries(/.*)$': '<rootDir>/app/graphql/queries$1', '^ee_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1', '^jh_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1', + '^any_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1', '^helpers(/.*)$': '<rootDir>/spec/frontend/__helpers__$1', '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1', [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures$1', @@ -72,6 +73,8 @@ module.exports = (path, options = {}) => { '^ee_component(/.*)$': rootDirEE, '^ee_else_ce(/.*)$': rootDirEE, '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1', + '^any_else_ce(/.*)$': rootDirEE, + '^jh_else_ee(/.*)$': rootDirEE, [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures-ee$1', ...extModuleNameMapperEE, }); @@ -84,8 +87,11 @@ module.exports = (path, options = {}) => { Object.assign(moduleNameMapper, { '^jh(/.*)$': rootDirJH, '^jh_component(/.*)$': rootDirJH, - '^jh_else_ce(/.*)$': rootDirJH, '^jh_jest/(.*)$': '<rootDir>/jh/spec/frontend/$1', + // jh path alias https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305#note_732793956 + '^jh_else_ce(/.*)$': rootDirJH, + '^jh_else_ee(/.*)$': rootDirJH, + '^any_else_ce(/.*)$': rootDirJH, ...extModuleNameMapperJH, }); |