diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /jest.config.base.js | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'jest.config.base.js')
-rw-r--r-- | jest.config.base.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jest.config.base.js b/jest.config.base.js index 422b6779af4..ea2ebadd578 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -40,6 +40,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_fixtures(/.*)$': '<rootDir>/tmp/tests/frontend/fixtures$1', }; const collectCoverageFrom = ['<rootDir>/app/assets/javascripts/**/*.{js,vue}']; @@ -51,6 +53,7 @@ module.exports = path => { '^ee_component(/.*)$': rootDirEE, '^ee_else_ce(/.*)$': rootDirEE, '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1', + 'test_fixtures(/.*)$': '<rootDir>/tmp/tests/frontend/fixtures-ee$1', }); collectCoverageFrom.push(rootDirEE.replace('$1', '/**/*.{js,vue}')); @@ -75,7 +78,7 @@ module.exports = path => { cacheDirectory: '<rootDir>/tmp/cache/jest', modulePathIgnorePatterns: ['<rootDir>/.yarn-cache/'], reporters, - setupFilesAfterEnv: ['<rootDir>/spec/frontend/test_setup.js', 'jest-canvas-mock'], + setupFilesAfterEnv: [`<rootDir>/${path}/test_setup.js`, 'jest-canvas-mock'], restoreMocks: true, transform: { '^.+\\.(gql|graphql)$': 'jest-transform-graphql', |