Add latest changes from gitlab-org/gitlab@master

1 files changed, 62 insertions, 1 deletions

diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index 7f8acd68ff6..c59e5876346 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -5,7 +5,7 @@ import {
   formatBoardLists,
   formatIssueInput,
 } from '~/boards/boards_util';
-import { inactiveId } from '~/boards/constants';
+import { inactiveId, ISSUABLE } from '~/boards/constants';
 import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql';
 import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql';
 import issueMoveListMutation from '~/boards/graphql/issue_move_list.mutation.graphql';
@@ -1246,6 +1246,7 @@ describe('setSelectedProject', () => {
 
 describe('toggleBoardItemMultiSelection', () => {
   const boardItem = mockIssue;
+  const boardItem2 = mockIssue2;
 
   it('should commit mutation ADD_BOARD_ITEM_TO_SELECTION if item is not on selection state', () => {
     testAction(
@@ -1276,6 +1277,66 @@ describe('toggleBoardItemMultiSelection', () => {
       [],
     );
   });
+
+  it('should additionally commit mutation ADD_BOARD_ITEM_TO_SELECTION for active issue and dispatch unsetActiveId', () => {
+    testAction(
+      actions.toggleBoardItemMultiSelection,
+      boardItem2,
+      { activeId: mockActiveIssue.id, activeIssue: mockActiveIssue, selectedBoardItems: [] },
+      [
+        {
+          type: types.ADD_BOARD_ITEM_TO_SELECTION,
+          payload: mockActiveIssue,
+        },
+        {
+          type: types.ADD_BOARD_ITEM_TO_SELECTION,
+          payload: boardItem2,
+        },
+      ],
+      [{ type: 'unsetActiveId' }],
+    );
+  });
+});
+
+describe('resetBoardItemMultiSelection', () => {
+  it('should commit mutation RESET_BOARD_ITEM_SELECTION', () => {
+    testAction({
+      action: actions.resetBoardItemMultiSelection,
+      state: { selectedBoardItems: [mockIssue] },
+      expectedMutations: [
+        {
+          type: types.RESET_BOARD_ITEM_SELECTION,
+        },
+      ],
+    });
+  });
+});
+
+describe('toggleBoardItem', () => {
+  it('should dispatch resetBoardItemMultiSelection and unsetActiveId when boardItem is the active item', () => {
+    testAction({
+      action: actions.toggleBoardItem,
+      payload: { boardItem: mockIssue },
+      state: {
+        activeId: mockIssue.id,
+      },
+      expectedActions: [{ type: 'resetBoardItemMultiSelection' }, { type: 'unsetActiveId' }],
+    });
+  });
+
+  it('should dispatch resetBoardItemMultiSelection and setActiveId when boardItem is not the active item', () => {
+    testAction({
+      action: actions.toggleBoardItem,
+      payload: { boardItem: mockIssue },
+      state: {
+        activeId: inactiveId,
+      },
+      expectedActions: [
+        { type: 'resetBoardItemMultiSelection' },
+        { type: 'setActiveId', payload: { id: mockIssue.id, sidebarType: ISSUABLE } },
+      ],
+    });
+  });
 });
 
 describe('fetchBacklog', () => {