Add latest changes from gitlab-org/gitlab@master

4 files changed, 8 insertions, 5 deletions

diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js
index 38b79e2e3f3..71a10fe7114 100644
--- a/spec/frontend/boards/components/board_card_spec.js
+++ b/spec/frontend/boards/components/board_card_spec.js
@@ -61,6 +61,7 @@ describe('Board card', () => {
         rootPath: '/',
         scopedLabelsAvailable: false,
         isEpicBoard: false,
+        issuableType: 'issue',
         ...provide,
       },
     });
diff --git a/spec/frontend/boards/components/board_content_sidebar_spec.js b/spec/frontend/boards/components/board_content_sidebar_spec.js
index 0d5b1d16e30..cab00390901 100644
--- a/spec/frontend/boards/components/board_content_sidebar_spec.js
+++ b/spec/frontend/boards/components/board_content_sidebar_spec.js
@@ -7,7 +7,7 @@ import SidebarDropdownWidget from 'ee_else_ce/sidebar/components/sidebar_dropdow
 import { stubComponent } from 'helpers/stub_component';
 import BoardContentSidebar from '~/boards/components/board_content_sidebar.vue';
 import BoardSidebarTitle from '~/boards/components/sidebar/board_sidebar_title.vue';
-import { ISSUABLE } from '~/boards/constants';
+import { ISSUABLE, issuableTypes } from '~/boards/constants';
 import SidebarDateWidget from '~/sidebar/components/date/sidebar_date_widget.vue';
 import SidebarSeverity from '~/sidebar/components/severity/sidebar_severity.vue';
 import SidebarSubscriptionsWidget from '~/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue';
@@ -26,7 +26,6 @@ describe('BoardContentSidebar', () => {
         sidebarType: ISSUABLE,
         issues: { [mockIssue.id]: { ...mockIssue, epic: null } },
         activeId: mockIssue.id,
-        issuableType: 'issue',
       },
       getters: {
         activeBoardItem: () => {
@@ -55,6 +54,7 @@ describe('BoardContentSidebar', () => {
         canUpdate: true,
         rootPath: '/',
         groupId: 1,
+        issuableType: issuableTypes.issue,
       },
       store,
       stubs: {
diff --git a/spec/frontend/boards/components/board_new_issue_spec.js b/spec/frontend/boards/components/board_new_issue_spec.js
index f097f42476a..398caa4de62 100644
--- a/spec/frontend/boards/components/board_new_issue_spec.js
+++ b/spec/frontend/boards/components/board_new_issue_spec.js
@@ -14,7 +14,7 @@ const addListNewIssuesSpy = jest.fn().mockResolvedValue();
 const mockActions = { addListNewIssue: addListNewIssuesSpy };
 
 const createComponent = ({
-  state = { selectedProject: mockGroupProjects[0], fullPath: mockGroupProjects[0].fullPath },
+  state = { selectedProject: mockGroupProjects[0] },
   actions = mockActions,
   getters = { isGroupBoard: () => true, getBoardItemsByList: () => () => [] },
 } = {}) =>
@@ -29,6 +29,7 @@ const createComponent = ({
     },
     provide: {
       groupId: 1,
+      fullPath: mockGroupProjects[0].fullPath,
       weightFeatureAvailable: false,
       boardWeight: null,
     },
diff --git a/spec/frontend/boards/components/boards_selector_spec.js b/spec/frontend/boards/components/boards_selector_spec.js
index f3be66db36f..9f7d36330b0 100644
--- a/spec/frontend/boards/components/boards_selector_spec.js
+++ b/spec/frontend/boards/components/boards_selector_spec.js
@@ -46,7 +46,6 @@ describe('BoardsSelector', () => {
         isProjectBoard: () => isProjectBoard,
       },
       state: {
-        boardType: isGroupBoard ? 'group' : 'project',
         board: mockBoard,
       },
     });
@@ -86,6 +85,7 @@ describe('BoardsSelector', () => {
   const createComponent = ({
     projectBoardsQueryHandler = projectBoardsQueryHandlerSuccess,
     projectRecentBoardsQueryHandler = projectRecentBoardsQueryHandlerSuccess,
+    isGroupBoard = false,
   } = {}) => {
     fakeApollo = createMockApollo([
       [projectBoardsQuery, projectBoardsQueryHandler],
@@ -109,6 +109,7 @@ describe('BoardsSelector', () => {
         multipleIssueBoardsAvailable: true,
         scopedIssueBoardFeatureEnabled: true,
         weights: [],
+        boardType: isGroupBoard ? 'group' : 'project',
       },
     });
   };
@@ -233,7 +234,7 @@ describe('BoardsSelector', () => {
         isProjectBoard: boardType === BoardType.project,
         isGroupBoard: boardType === BoardType.group,
       });
-      createComponent();
+      createComponent({ isGroupBoard: boardType === BoardType.group });
 
       await nextTick();