diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-05 13:38:10 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-05 13:38:10 +0000 |
| commit | 8c28813866db46e697a4702e752c2dfc884e304e (patch) | |
| tree | b4e65800d82e5f01fcc4d168b6abc61593904660 | |
| parent | 63c0a702159068576ab93d98a13b7b14dd63104b (diff) | |
| parent | 7b4756162a6f279a86d298e3015628d3b8d14cac (diff) | |
| download | gitlab-ce-8c28813866db46e697a4702e752c2dfc884e304e.tar.gz | |
Merge branch 'winh-jest-ee_else_ce' into 'master'
Add ee_else_ce to Jest config
See merge request gitlab-org/gitlab-ce!27040
| -rw-r--r-- | jest.config.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/jest.config.js b/jest.config.js index c7518be9e96..fdbbe977f0b 100644 --- a/jest.config.js +++ b/jest.config.js @@ -16,10 +16,13 @@ module.exports = { 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', - '^vendor(.*)$': '<rootDir>/vendor/assets/javascripts$1', + '^~(/.*)$': '<rootDir>/app/assets/javascripts$1', + '^ee(/.*)$': '<rootDir>/ee/app/assets/javascripts$1', + '^ee_else_ce(/.*)$': IS_EE + ? '<rootDir>/ee/app/assets/javascripts$1' + : '<rootDir>/app/assets/javascripts$1', + '^helpers(/.*)$': '<rootDir>/spec/frontend/helpers$1', + '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1', '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js', }, collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'], |