summaryrefslogtreecommitdiff
path: root/jest.config.base.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
commit48aff82709769b098321c738f3444b9bdaa694c6 (patch)
treee00c7c43e2d9b603a5a6af576b1685e400410dee /jest.config.base.js
parent879f5329ee916a948223f8f43d77fba4da6cd028 (diff)
downloadgitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'jest.config.base.js')
-rw-r--r--jest.config.base.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/jest.config.base.js b/jest.config.base.js
index ea2ebadd578..9f611775776 100644
--- a/jest.config.base.js
+++ b/jest.config.base.js
@@ -12,7 +12,8 @@ module.exports = path => {
reporters.push([
'jest-junit',
{
- output: './junit_jest.xml',
+ outputName: './junit_jest.xml',
+ addFileAttribute: 'true',
},
]);
}
@@ -33,6 +34,7 @@ module.exports = path => {
'^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
'^ee_component(/.*)$':
'<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
+ '^shared_queries(/.*)$': '<rootDir>/app/graphql/queries$1',
'^ee_else_ce(/.*)$': '<rootDir>/app/assets/javascripts$1',
'^helpers(/.*)$': '<rootDir>/spec/frontend/helpers$1',
'^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1',