Add latest changes from gitlab-org/gitlab@master

6 files changed, 13 insertions, 11 deletions

diff --git a/spec/frontend/boards/components/board_add_new_column_spec.js b/spec/frontend/boards/components/board_add_new_column_spec.js
index 5fae1c4359f..a3b2988ce75 100644
--- a/spec/frontend/boards/components/board_add_new_column_spec.js
+++ b/spec/frontend/boards/components/board_add_new_column_spec.js
@@ -53,11 +53,11 @@ describe('Board card layout', () => {
           state: {
             labels,
             labelsLoading: false,
-            isEpicBoard: false,
           },
         }),
         provide: {
           scopedLabelsAvailable: true,
+          isEpicBoard: false,
         },
       }),
     );
diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js
index 2feaa5dff8c..38b79e2e3f3 100644
--- a/spec/frontend/boards/components/board_card_spec.js
+++ b/spec/frontend/boards/components/board_card_spec.js
@@ -30,7 +30,6 @@ describe('Board card', () => {
       },
       actions: mockActions,
       getters: {
-        isEpicBoard: () => false,
         isProjectBoard: () => false,
       },
     });
@@ -61,6 +60,7 @@ describe('Board card', () => {
         groupId: null,
         rootPath: '/',
         scopedLabelsAvailable: false,
+        isEpicBoard: false,
         ...provide,
       },
     });
diff --git a/spec/frontend/boards/components/board_content_spec.js b/spec/frontend/boards/components/board_content_spec.js
index bf491029c41..b2138700602 100644
--- a/spec/frontend/boards/components/board_content_spec.js
+++ b/spec/frontend/boards/components/board_content_spec.js
@@ -47,6 +47,8 @@ describe('BoardContent', () => {
     canAdminList = true,
     isApolloBoard = false,
     issuableType = 'issue',
+    isIssueBoard = true,
+    isEpicBoard = false,
     boardListQueryHandler = jest.fn().mockResolvedValue(boardListsQueryResponse),
   } = {}) => {
     fakeApollo = createMockApollo([[boardListsQuery, boardListQueryHandler]]);
@@ -67,6 +69,8 @@ describe('BoardContent', () => {
         boardType: 'group',
         fullPath: 'gitlab-org/gitlab',
         issuableType,
+        isIssueBoard,
+        isEpicBoard,
         isApolloBoard,
       },
       store,
@@ -133,7 +137,7 @@ describe('BoardContent', () => {
 
   describe('when issuableType is not issue', () => {
     beforeEach(() => {
-      createComponent({ issuableType: 'foo' });
+      createComponent({ issuableType: 'foo', isIssueBoard: false });
     });
 
     it('does not render BoardContentSidebar', () => {
diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js
index 50901f3fe84..4633612891c 100644
--- a/spec/frontend/boards/components/board_list_header_spec.js
+++ b/spec/frontend/boards/components/board_list_header_spec.js
@@ -59,7 +59,6 @@ describe('Board List Header Component', () => {
     store = new Vuex.Store({
       state: {},
       actions: { updateList: updateListSpy, toggleListCollapsed: toggleListCollapsedSpy },
-      getters: { isEpicBoard: () => false },
     });
 
     fakeApollo = createMockApollo([[listQuery, listQueryHandler]]);
@@ -76,6 +75,7 @@ describe('Board List Header Component', () => {
           boardId,
           weightFeatureAvailable: false,
           currentUserId,
+          isEpicBoard: false,
         },
       }),
     );
diff --git a/spec/frontend/boards/components/board_settings_sidebar_spec.js b/spec/frontend/boards/components/board_settings_sidebar_spec.js
index 4171a6236de..7d602042685 100644
--- a/spec/frontend/boards/components/board_settings_sidebar_spec.js
+++ b/spec/frontend/boards/components/board_settings_sidebar_spec.js
@@ -45,6 +45,7 @@ describe('BoardSettingsSidebar', () => {
         provide: {
           canAdminList,
           scopedLabelsAvailable: false,
+          isIssueBoard: true,
         },
         directives: {
           GlModal: createMockDirective(),
diff --git a/spec/frontend/boards/components/board_top_bar_spec.js b/spec/frontend/boards/components/board_top_bar_spec.js
index 997768a0cc7..08b5042f70f 100644
--- a/spec/frontend/boards/components/board_top_bar_spec.js
+++ b/spec/frontend/boards/components/board_top_bar_spec.js
@@ -15,18 +15,14 @@ describe('BoardTopBar', () => {
 
   Vue.use(Vuex);
 
-  const createStore = ({ mockGetters = {} } = {}) => {
+  const createStore = () => {
     return new Vuex.Store({
       state: {},
-      getters: {
-        isEpicBoard: () => false,
-        ...mockGetters,
-      },
     });
   };
 
-  const createComponent = ({ provide = {}, mockGetters = {} } = {}) => {
-    const store = createStore({ mockGetters });
+  const createComponent = ({ provide = {} } = {}) => {
+    const store = createStore();
     wrapper = shallowMount(BoardTopBar, {
       store,
       provide: {
@@ -36,6 +32,7 @@ describe('BoardTopBar', () => {
         fullPath: 'gitlab-org',
         boardType: 'group',
         releasesFetchPath: '/releases',
+        isIssueBoard: true,
         ...provide,
       },
       stubs: { IssueBoardFilteredSearch },