Add latest changes from gitlab-org/gitlab@master

1 files changed, 45 insertions, 11 deletions

diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index 62e0fa7a68a..5fc661f2fac 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -1331,20 +1331,54 @@ describe('addListItem', () => {
       list: mockLists[0],
       item: mockIssue,
       position: 0,
+      inProgress: true,
     };
 
-    testAction(actions.addListItem, payload, {}, [
-      {
-        type: types.ADD_BOARD_ITEM_TO_LIST,
-        payload: {
-          listId: mockLists[0].id,
-          itemId: mockIssue.id,
-          atIndex: 0,
-          inProgress: false,
+    testAction(
+      actions.addListItem,
+      payload,
+      {},
+      [
+        {
+          type: types.ADD_BOARD_ITEM_TO_LIST,
+          payload: {
+            listId: mockLists[0].id,
+            itemId: mockIssue.id,
+            atIndex: 0,
+            inProgress: true,
+          },
         },
-      },
-      { type: types.UPDATE_BOARD_ITEM, payload: mockIssue },
-    ]);
+        { type: types.UPDATE_BOARD_ITEM, payload: mockIssue },
+      ],
+      [],
+    );
+  });
+
+  it('should commit ADD_BOARD_ITEM_TO_LIST and UPDATE_BOARD_ITEM mutations, dispatch setActiveId action when inProgress is false', () => {
+    const payload = {
+      list: mockLists[0],
+      item: mockIssue,
+      position: 0,
+    };
+
+    testAction(
+      actions.addListItem,
+      payload,
+      {},
+      [
+        {
+          type: types.ADD_BOARD_ITEM_TO_LIST,
+          payload: {
+            listId: mockLists[0].id,
+            itemId: mockIssue.id,
+            atIndex: 0,
+            inProgress: false,
+          },
+        },
+        { type: types.UPDATE_BOARD_ITEM, payload: mockIssue },
+      ],
+      [{ type: 'setActiveId', payload: { id: mockIssue.id, sidebarType: ISSUABLE } }],
+    );
   });
 });