Merge branch 'psi-foss-ee-unresolved' into 'master'

Fix some unresolved ee imports [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!56735

app/assets/javascripts/boards/components/board_content_sidebar.vue

 <script>
 import { GlDrawer } from '@gitlab/ui';
 import { mapState, mapActions, mapGetters } from 'vuex';
-import BoardSidebarEpicSelect from 'ee_component/boards/components/sidebar/board_sidebar_epic_select.vue';
-import BoardSidebarWeightInput from 'ee_component/boards/components/sidebar/board_sidebar_weight_input.vue';
-import SidebarIterationWidget from 'ee_component/sidebar/components/sidebar_iteration_widget.vue';
 import BoardSidebarDueDate from '~/boards/components/sidebar/board_sidebar_due_date.vue';
 import BoardSidebarIssueTitle from '~/boards/components/sidebar/board_sidebar_issue_title.vue';
 import BoardSidebarLabelsSelect from '~/boards/components/sidebar/board_sidebar_labels_select.vue';
@@ -26,9 +23,12 @@ export default {
     BoardSidebarDueDate,
     BoardSidebarSubscription,
     BoardSidebarMilestoneSelect,
-    BoardSidebarEpicSelect,
-    SidebarIterationWidget,
-    BoardSidebarWeightInput,
+    BoardSidebarEpicSelect: () =>
+      import('ee_component/boards/components/sidebar/board_sidebar_epic_select.vue'),
+    BoardSidebarWeightInput: () =>
+      import('ee_component/boards/components/sidebar/board_sidebar_weight_input.vue'),
+    SidebarIterationWidget: () =>
+      import('ee_component/sidebar/components/sidebar_iteration_widget.vue'),
   },
   mixins: [glFeatureFlagsMixin()],
   computed: {

ee/spec/frontend/boards/components/board_content_sidebar_spec.js

@@ -15,12 +15,14 @@ describe('ee/BoardContentSidebar', () => {
     store = new Vuex.Store({
       state: {
         sidebarType: ISSUABLE,
-        issues: { [mockIssue.id]: mockIssue },
+        issues: { [mockIssue.id]: { ...mockIssue, epic: null } },
         activeId: mockIssue.id,
         issuableType: issuableTypes.issue,
       },
       getters: {
-        activeIssue: () => mockIssue,
+        activeIssue: () => {
+          return { ...mockIssue, epic: null };
+        },
         projectPathForActiveIssue: () => mockIssueProjectPath,
         groupPathForActiveIssue: () => mockIssueGroupPath,
         isSidebarOpen: () => true,
@@ -31,11 +33,18 @@ describe('ee/BoardContentSidebar', () => {
   };
 
   const createComponent = () => {
+    /*
+      Dynamically imported components (in our case ee imports)
+      aren't stubbed automatically in VTU v1:
+      https://github.com/vuejs/vue-test-utils/issues/1279.
+
+      This requires us to additionally mock apollo or vuex stores.
+    */
     wrapper = shallowMount(BoardContentSidebar, {
       provide: {
         canUpdate: true,
         rootPath: '/',
-        groupId: '#',
+        groupId: 1,
       },
       store,
       stubs: {
@@ -49,6 +58,12 @@ describe('ee/BoardContentSidebar', () => {
             participants: {
               loading: false,
             },
+            currentIteration: {
+              loading: false,
+            },
+            iterations: {
+              loading: false,
+            },
           },
         },
       },

spec/frontend/boards/components/board_content_sidebar_spec.js

@@ -19,12 +19,14 @@ describe('BoardContentSidebar', () => {
     store = new Vuex.Store({
       state: {
         sidebarType: ISSUABLE,
-        issues: { [mockIssue.id]: mockIssue },
+        issues: { [mockIssue.id]: { ...mockIssue, epic: null } },
         activeId: mockIssue.id,
         issuableType: 'issue',
       },
       getters: {
-        activeIssue: () => mockIssue,
+        activeIssue: () => {
+          return { ...mockIssue, epic: null };
+        },
         groupPathForActiveIssue: () => mockIssueGroupPath,
         projectPathForActiveIssue: () => mockIssueProjectPath,
         isSidebarOpen: () => true,
@@ -35,11 +37,18 @@ describe('BoardContentSidebar', () => {
   };
 
   const createComponent = () => {
+    /*
+      Dynamically imported components (in our case ee imports)
+      aren't stubbed automatically in VTU v1:
+      https://github.com/vuejs/vue-test-utils/issues/1279.
+
+      This requires us to additionally mock apollo or vuex stores.
+    */
     wrapper = shallowMount(BoardContentSidebar, {
       provide: {
         canUpdate: true,
         rootPath: '/',
-        groupId: '#',
+        groupId: 1,
       },
       store,
       stubs: {
@@ -53,6 +62,12 @@ describe('BoardContentSidebar', () => {
             participants: {
               loading: false,
             },
+            currentIteration: {
+              loading: false,
+            },
+            iterations: {
+              loading: false,
+            },
           },
         },
       },
@@ -117,7 +132,7 @@ describe('BoardContentSidebar', () => {
 
       expect(toggleBoardItem).toHaveBeenCalledTimes(1);
       expect(toggleBoardItem).toHaveBeenCalledWith(expect.any(Object), {
-        boardItem: mockIssue,
+        boardItem: { ...mockIssue, epic: null },
         sidebarType: ISSUABLE,
       });
     });