Merge branch '196877-jest-webpack-alias' into 'master'

Adds the alias for jest tests

Closes #196877

See merge request gitlab-org/gitlab!23095

config/webpack.config.js

@@ -92,6 +92,7 @@ const alias = {
   vendor: path.join(ROOT_PATH, 'vendor/assets/javascripts'),
   vue$: 'vue/dist/vue.esm.js',
   spec: path.join(ROOT_PATH, 'spec/javascripts'),
+  jest: path.join(ROOT_PATH, 'spec/frontend'),
 
   // the following resolves files which are different between CE and EE
   ee_else_ce: path.join(ROOT_PATH, 'app/assets/javascripts'),
@@ -111,6 +112,7 @@ if (IS_EE) {
     ee_icons: path.join(ROOT_PATH, 'ee/app/views/shared/icons'),
     ee_images: path.join(ROOT_PATH, 'ee/app/assets/images'),
     ee_spec: path.join(ROOT_PATH, 'ee/spec/javascripts'),
+    ee_jest: path.join(ROOT_PATH, 'ee/spec/frontend'),
     ee_else_ce: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
   });
 }

ee/spec/frontend/monitoring/panel_type_spec.js

@@ -6,7 +6,7 @@ import PanelType from 'ee/monitoring/components/panel_type.vue';
 import AlertWidget from 'ee/monitoring/components/alert_widget.vue';
 import { createStore } from '~/monitoring/stores';
 import axios from '~/lib/utils/axios_utils';
-import { graphDataPrometheusQueryRange } from '../../../../spec/frontend/monitoring/mock_data';
+import { graphDataPrometheusQueryRange } from 'jest/monitoring/mock_data';
 
 global.URL.createObjectURL = jest.fn();
 

jest.config.js

@@ -38,6 +38,7 @@ const moduleNameMapper = {
   '\\.(jpg|jpeg|png|svg)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
   'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
   '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants',
+  '^jest/(.*)$': '<rootDir>/spec/frontend/$1',
 };
 
 const collectCoverageFrom = ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'];
@@ -48,6 +49,7 @@ if (IS_EE) {
     '^ee(/.*)$': rootDirEE,
     '^ee_component(/.*)$': rootDirEE,
     '^ee_else_ce(/.*)$': rootDirEE,
+    '^ee_jest/(.*)$': '<rootDir>/ee/spec/frontend/$1',
   });
 
   collectCoverageFrom.push(rootDirEE.replace('$1', '/**/*.{js,vue}'));