diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 00:08:47 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-22 00:08:47 +0000 |
commit | 66ce6a78f6203652c34bd0532b63c394d5394cc4 (patch) | |
tree | 67408e003b1c4136bb8e35c1e9ac049563c1f1d5 /jest.config.js | |
parent | 1c23b3f1315ba1da3c3765acd34feb5c05bc7704 (diff) | |
download | gitlab-ce-66ce6a78f6203652c34bd0532b63c394d5394cc4.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'jest.config.js')
-rw-r--r-- | jest.config.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/jest.config.js b/jest.config.js index 59e09c85b5a..d07c034e88e 100644 --- a/jest.config.js +++ b/jest.config.js @@ -38,6 +38,7 @@ const moduleNameMapper = { '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js', 'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json', '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants', + '^jest/(.*)$': '<rootDir>/spec/frontend/$1', }; const collectCoverageFrom = ['<rootDir>/app/assets/javascripts/**/*.{js,vue}']; @@ -48,6 +49,7 @@ if (IS_EE) { '^ee(/.*)$': rootDirEE, '^ee_component(/.*)$': rootDirEE, '^ee_else_ce(/.*)$': rootDirEE, + '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1', }); collectCoverageFrom.push(rootDirEE.replace('$1', '/**/*.{js,vue}')); |