Add latest changes from gitlab-org/gitlab@master

7 files changed, 6 insertions, 8 deletions

diff --git a/spec/frontend/boards/board_list_helper.js b/spec/frontend/boards/board_list_helper.js
index af5509fd2e9..1ba546f24a8 100644
--- a/spec/frontend/boards/board_list_helper.js
+++ b/spec/frontend/boards/board_list_helper.js
@@ -86,7 +86,6 @@ export default function createComponent({
     apolloProvider: fakeApollo,
     store,
     propsData: {
-      disabled: false,
       list,
       boardItems: [issue],
       canAdminList: true,
@@ -104,6 +103,7 @@ export default function createComponent({
       isEpicBoard: false,
       isGroupBoard: false,
       isProjectBoard: true,
+      disabled: false,
       ...provide,
     },
     stubs,
diff --git a/spec/frontend/boards/board_list_spec.js b/spec/frontend/boards/board_list_spec.js
index 34c0504143c..abe8c230bd8 100644
--- a/spec/frontend/boards/board_list_spec.js
+++ b/spec/frontend/boards/board_list_spec.js
@@ -267,7 +267,7 @@ describe('Board list component', () => {
     describe('when dragging is not allowed', () => {
       beforeEach(() => {
         wrapper = createComponent({
-          componentProps: {
+          provide: {
             disabled: true,
           },
         });
diff --git a/spec/frontend/boards/components/board_app_spec.js b/spec/frontend/boards/components/board_app_spec.js
index c209f2f82e6..872a67a71fb 100644
--- a/spec/frontend/boards/components/board_app_spec.js
+++ b/spec/frontend/boards/components/board_app_spec.js
@@ -23,11 +23,10 @@ describe('BoardApp', () => {
     });
   };
 
-  const createComponent = ({ provide = { disabled: true } } = {}) => {
+  const createComponent = () => {
     wrapper = shallowMount(BoardApp, {
       store,
       provide: {
-        ...provide,
         fullBoardId: 'gid://gitlab/Board/1',
       },
     });
diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js
index cd3882dc9ee..f8ad7c468c1 100644
--- a/spec/frontend/boards/components/board_card_spec.js
+++ b/spec/frontend/boards/components/board_card_spec.js
@@ -49,7 +49,6 @@ describe('Board card', () => {
       propsData: {
         list: mockLabelList,
         item,
-        disabled: false,
         index: 0,
         ...propsData,
       },
@@ -61,6 +60,7 @@ describe('Board card', () => {
         issuableType: 'issue',
         isProjectBoard: false,
         isGroupBoard: true,
+        disabled: false,
         ...provide,
       },
     });
diff --git a/spec/frontend/boards/components/board_column_spec.js b/spec/frontend/boards/components/board_column_spec.js
index c13f7caba76..d34e228a2d7 100644
--- a/spec/frontend/boards/components/board_column_spec.js
+++ b/spec/frontend/boards/components/board_column_spec.js
@@ -34,7 +34,6 @@ describe('Board Column Component', () => {
     wrapper = shallowMount(BoardColumn, {
       store,
       propsData: {
-        disabled: false,
         list: listMock,
       },
     });
diff --git a/spec/frontend/boards/components/board_content_spec.js b/spec/frontend/boards/components/board_content_spec.js
index 98f66ed804a..97596c86198 100644
--- a/spec/frontend/boards/components/board_content_spec.js
+++ b/spec/frontend/boards/components/board_content_spec.js
@@ -60,7 +60,6 @@ describe('BoardContent', () => {
     wrapper = shallowMount(BoardContent, {
       apolloProvider: fakeApollo,
       propsData: {
-        disabled: false,
         boardId: 'gid://gitlab/Board/1',
         ...props,
       },
@@ -72,6 +71,7 @@ describe('BoardContent', () => {
         isIssueBoard,
         isEpicBoard,
         isGroupBoard: true,
+        disabled: false,
         isApolloBoard,
       },
       store,
diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js
index 4633612891c..a16b99728c3 100644
--- a/spec/frontend/boards/components/board_list_header_spec.js
+++ b/spec/frontend/boards/components/board_list_header_spec.js
@@ -68,7 +68,6 @@ describe('Board List Header Component', () => {
         apolloProvider: fakeApollo,
         store,
         propsData: {
-          disabled: false,
           list: listMock,
         },
         provide: {
@@ -76,6 +75,7 @@ describe('Board List Header Component', () => {
           weightFeatureAvailable: false,
           currentUserId,
           isEpicBoard: false,
+          disabled: false,
         },
       }),
     );