Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 1 deletions

diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index eacf9db191e..e1c9fa10dde 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -85,6 +85,9 @@ describe('fetchBoard', () => {
       payload,
       expectedMutations: [
         {
+          type: types.REQUEST_CURRENT_BOARD,
+        },
+        {
           type: types.RECEIVE_BOARD_SUCCESS,
           payload: mockBoard,
         },
@@ -101,6 +104,9 @@ describe('fetchBoard', () => {
       payload,
       expectedMutations: [
         {
+          type: types.REQUEST_CURRENT_BOARD,
+        },
+        {
           type: types.RECEIVE_BOARD_FAILURE,
         },
       ],
@@ -133,6 +139,20 @@ describe('setBoardConfig', () => {
   });
 });
 
+describe('setBoard', () => {
+  it('dispatches setBoardConfig', () => {
+    return testAction({
+      action: actions.setBoard,
+      payload: mockBoard,
+      expectedMutations: [{ type: types.RECEIVE_BOARD_SUCCESS, payload: mockBoard }],
+      expectedActions: [
+        { type: 'setBoardConfig', payload: mockBoard },
+        { type: 'performSearch', payload: { resetLists: true } },
+      ],
+    });
+  });
+});
+
 describe('setFilters', () => {
   it.each([
     [
@@ -172,7 +192,11 @@ describe('performSearch', () => {
       {},
       {},
       [],
-      [{ type: 'setFilters', payload: {} }, { type: 'fetchLists' }, { type: 'resetIssues' }],
+      [
+        { type: 'setFilters', payload: {} },
+        { type: 'fetchLists', payload: { resetLists: false } },
+        { type: 'resetIssues' },
+      ],
     );
   });
 });