Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js
index d29d5c18854..0b90912a584 100644
--- a/spec/frontend/boards/stores/actions_spec.js
+++ b/spec/frontend/boards/stores/actions_spec.js
@@ -1577,7 +1577,7 @@ describe('setActiveIssueLabels', () => {
     projectPath: 'h/b',
   };
 
-  it('should assign labels on success', (done) => {
+  it('should assign labels on success, and sets loading state for labels', (done) => {
     jest
       .spyOn(gqlClient, 'mutate')
       .mockResolvedValue({ data: { updateIssue: { issue: { labels: { nodes: labels } } } } });
@@ -1594,6 +1594,14 @@ describe('setActiveIssueLabels', () => {
       { ...state, ...getters },
       [
         {
+          type: types.SET_LABELS_LOADING,
+          payload: true,
+        },
+        {
+          type: types.SET_LABELS_LOADING,
+          payload: false,
+        },
+        {
           type: types.UPDATE_BOARD_ITEM_BY_ID,
           payload,
         },