summaryrefslogtreecommitdiff
path: root/jest.config.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-02-22 08:36:20 +0000
committerPhil Hughes <me@iamphill.com>2019-02-22 08:36:20 +0000
commitf6483cc3b807f96f830ef6f6e9b4bc37461dfd87 (patch)
treebe758634e98dd0db2b4f41755ecdb35656abc523 /jest.config.js
parent9c2bcca2e5ee378fecf623444e2f5177b9d92142 (diff)
parentdb583a3387ee410d6ea1ff597bcc3bfc6dc579d8 (diff)
downloadgitlab-ce-f6483cc3b807f96f830ef6f6e9b4bc37461dfd87.tar.gz
Merge branch 'winh-jest-config' into 'master'
Setup Jest for EE (CE backport) See merge request gitlab-org/gitlab-ce!25468
Diffstat (limited to 'jest.config.js')
-rw-r--r--jest.config.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/jest.config.js b/jest.config.js
index fac2e435cef..97979a38074 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -13,10 +13,11 @@ if (process.env.CI) {
// eslint-disable-next-line import/no-commonjs
module.exports = {
- testMatch: ['<rootDir>/spec/frontend/**/*_spec.js'],
+ testMatch: ['<rootDir>/spec/frontend/**/*_spec.js', '<rootDir>/ee/spec/frontend/**/*_spec.js'],
moduleFileExtensions: ['js', 'json', 'vue'],
moduleNameMapper: {
'^~(.*)$': '<rootDir>/app/assets/javascripts$1',
+ '^ee(.*)$': '<rootDir>/ee/app/assets/javascripts$1',
'^helpers(.*)$': '<rootDir>/spec/frontend/helpers$1',
},
collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'],