Merge branch 'winh-jest-ee_else_ce' into 'master'

Add ee_else_ce to Jest config See merge request gitlab-org/gitlab-ce!27040

Merge branch 'winh-jest-ee_else_ce' into 'master'
Add ee_else_ce to Jest config See merge request gitlab-org/gitlab-ce!27040
8c288138 · Phil Hughes · 63c0a702 · 7b475616 · 8c288138
Commit 8c288138 authored Apr 05, 2019 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

jest.config.js jest.config.js +7 -4

No files found.
--- 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',
+    '^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
-    '^ee(.*)$': '<rootDir>/ee/app/assets/javascripts$1',
+    '^ee(/.*)$': '<rootDir>/ee/app/assets/javascripts$1',
-    '^helpers(.*)$': '<rootDir>/spec/frontend/helpers$1',
+    '^ee_else_ce(/.*)$': IS_EE
-    '^vendor(.*)$': '<rootDir>/vendor/assets/javascripts$1',
+      ? '<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}'],