diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 11:10:13 +0000 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /jest.config.base.js | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) | |
download | gitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'jest.config.base.js')
-rw-r--r-- | jest.config.base.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jest.config.base.js b/jest.config.base.js index fb2f1084bea..452d58a185a 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -60,6 +60,7 @@ module.exports = (path, options = {}) => { 'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json', '^spec/test_constants$': '<rootDir>/spec/frontend/__helpers__/test_constants', '^jest/(.*)$': '<rootDir>/spec/frontend/$1', + '^ee_else_ce_jest/(.*)$': '<rootDir>/spec/frontend/$1', '^jquery$': '<rootDir>/node_modules/jquery/dist/jquery.slim.js', ...extModuleNameMapper, }; @@ -68,11 +69,13 @@ module.exports = (path, options = {}) => { if (IS_EE) { const rootDirEE = '<rootDir>/ee/app/assets/javascripts$1'; + const specDirEE = '<rootDir>/ee/spec/frontend/$1'; Object.assign(moduleNameMapper, { '^ee(/.*)$': rootDirEE, '^ee_component(/.*)$': rootDirEE, '^ee_else_ce(/.*)$': rootDirEE, - '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1', + '^ee_jest/(.*)$': specDirEE, + '^ee_else_ce_jest/(.*)$': specDirEE, '^any_else_ce(/.*)$': rootDirEE, '^jh_else_ee(/.*)$': rootDirEE, [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures-ee$1', @@ -83,11 +86,13 @@ module.exports = (path, options = {}) => { } if (IS_JH) { + // DO NOT add additional path to Jihu side, it might break things. const rootDirJH = '<rootDir>/jh/app/assets/javascripts$1'; + const specDirJH = '<rootDir>/jh/spec/frontend/$1'; Object.assign(moduleNameMapper, { '^jh(/.*)$': rootDirJH, '^jh_component(/.*)$': rootDirJH, - '^jh_jest/(.*)$': '<rootDir>/jh/spec/frontend/$1', + '^jh_jest/(.*)$': specDirJH, // jh path alias https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305#note_732793956 '^jh_else_ce(/.*)$': rootDirJH, '^jh_else_ee(/.*)$': rootDirJH, @@ -111,6 +116,7 @@ module.exports = (path, options = {}) => { 'remark-.*', 'hast*', 'unist.*', + 'markdown-table', 'mdast-util-.*', 'micromark.*', 'vfile.*', |