Merge branch 'winh-fix-foss-related_issuable_item_spec' into 'master'

Fix broken master in gitlab-foss (related_issuable_item_spec.js)

Closes #35249

See merge request gitlab-org/gitlab!19363

jest.config.js

@@ -28,25 +28,32 @@ if (isESLint) {
   testMatch = testMatch.map(path => path.replace('_spec.js', ''));
 }
 
+const moduleNameMapper = {
+  '^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
+  '^ee_component(/.*)$':
+    '<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
+  '^ee_else_ce(/.*)$': '<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',
+  'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
+  '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants',
+};
+
+if (IS_EE) {
+  const rootDirEE = '<rootDir>/ee/app/assets/javascripts$1';
+  Object.assign(moduleNameMapper, {
+    '^ee(/.*)$': rootDirEE,
+    '^ee_component(/.*)$': rootDirEE,
+    '^ee_else_ce(/.*)$': rootDirEE,
+  });
+}
+
 // eslint-disable-next-line import/no-commonjs
 module.exports = {
   testMatch,
   moduleFileExtensions: ['js', 'json', 'vue'],
-  moduleNameMapper: {
-    '^~(/.*)$': '<rootDir>/app/assets/javascripts$1',
-    '^ee(/.*)$': '<rootDir>/ee/app/assets/javascripts$1',
-    '^ee_component(/.*)$': IS_EE
-      ? '<rootDir>/ee/app/assets/javascripts$1'
-      : '<rootDir>/app/assets/javascripts/vue_shared/components/empty_component.js',
-    '^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',
-    'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
-    '^spec/test_constants$': '<rootDir>/spec/frontend/helpers/test_constants',
-  },
+  moduleNameMapper,
   collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'],
   coverageDirectory: '<rootDir>/coverage-frontend/',
   coverageReporters: ['json', 'lcov', 'text-summary', 'clover'],

spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js

 import Vue from 'vue';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { mount, createLocalVue } from '@vue/test-utils';
-import { PathIdSeparator } from 'ee/related_issues/constants';
 import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue';
 import {
   defaultAssignees,
@@ -13,7 +12,7 @@ describe('RelatedIssuableItem', () => {
   const props = {
     idKey: 1,
     displayReference: 'gitlab-org/gitlab-test#1',
-    pathIdSeparator: PathIdSeparator.Issue,
+    pathIdSeparator: '#',
     path: `${gl.TEST_HOST}/path`,
     title: 'title',
     confidential: true,