Add latest changes from gitlab-org/gitlab@master

2 files changed, 39 insertions, 7 deletions

diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index 920959f41e7..4a1d42647f8 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -944,10 +944,16 @@ describe('Actions Notes Store', () => {
     it('when service success, commits and resolves discussion', done => {
       testSubmitSuggestion(done, () => {
         expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
           [mutationTypes.APPLY_SUGGESTION, { discussionId, noteId, suggestionId }],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
         ]);
 
-        expect(dispatch.mock.calls).toEqual([['resolveDiscussion', { discussionId }]]);
+        expect(dispatch.mock.calls).toEqual([
+          ['stopPolling'],
+          ['resolveDiscussion', { discussionId }],
+          ['restartPolling'],
+        ]);
         expect(Flash).not.toHaveBeenCalled();
       });
     });
@@ -958,8 +964,11 @@ describe('Actions Notes Store', () => {
       Api.applySuggestion.mockReturnValue(Promise.reject(response));
 
       testSubmitSuggestion(done, () => {
-        expect(commit).not.toHaveBeenCalled();
-        expect(dispatch).not.toHaveBeenCalled();
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
+        ]);
+        expect(dispatch.mock.calls).toEqual([['stopPolling'], ['restartPolling']]);
         expect(Flash).toHaveBeenCalledWith(TEST_ERROR_MESSAGE, 'alert', flashContainer);
       });
     });
@@ -970,8 +979,11 @@ describe('Actions Notes Store', () => {
       Api.applySuggestion.mockReturnValue(Promise.reject(response));
 
       testSubmitSuggestion(done, () => {
-        expect(commit).not.toHaveBeenCalled();
-        expect(dispatch).not.toHaveBeenCalled();
+        expect(commit.mock.calls).toEqual([
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
+        ]);
+        expect(dispatch.mock.calls).toEqual([['stopPolling'], ['restartPolling']]);
         expect(Flash).toHaveBeenCalledWith(
           'Something went wrong while applying the suggestion. Please try again.',
           'alert',
@@ -1015,15 +1027,19 @@ describe('Actions Notes Store', () => {
       testSubmitSuggestionBatch(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
           [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[0]],
           [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[1]],
           [mutationTypes.CLEAR_SUGGESTION_BATCH],
           [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
         ]);
 
         expect(dispatch.mock.calls).toEqual([
+          ['stopPolling'],
           ['resolveDiscussion', { discussionId: discussionIds[0] }],
           ['resolveDiscussion', { discussionId: discussionIds[1] }],
+          ['restartPolling'],
         ]);
 
         expect(Flash).not.toHaveBeenCalled();
@@ -1038,10 +1054,12 @@ describe('Actions Notes Store', () => {
       testSubmitSuggestionBatch(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
           [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
         ]);
 
-        expect(dispatch).not.toHaveBeenCalled();
+        expect(dispatch.mock.calls).toEqual([['stopPolling'], ['restartPolling']]);
         expect(Flash).toHaveBeenCalledWith(TEST_ERROR_MESSAGE, 'alert', flashContainer);
       });
     });
@@ -1054,10 +1072,12 @@ describe('Actions Notes Store', () => {
       testSubmitSuggestionBatch(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
           [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
         ]);
 
-        expect(dispatch).not.toHaveBeenCalled();
+        expect(dispatch.mock.calls).toEqual([['stopPolling'], ['restartPolling']]);
         expect(Flash).toHaveBeenCalledWith(
           'Something went wrong while applying the batch of suggestions. Please try again.',
           'alert',
@@ -1072,10 +1092,12 @@ describe('Actions Notes Store', () => {
       testSubmitSuggestionBatch(done, () => {
         expect(commit.mock.calls).toEqual([
           [mutationTypes.SET_APPLYING_BATCH_STATE, true],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, true],
           [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[0]],
           [mutationTypes.APPLY_SUGGESTION, batchSuggestionsInfo[1]],
           [mutationTypes.CLEAR_SUGGESTION_BATCH],
           [mutationTypes.SET_APPLYING_BATCH_STATE, false],
+          [mutationTypes.SET_RESOLVING_DISCUSSION, false],
         ]);
 
         expect(Flash).not.toHaveBeenCalled();
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index 2618c3a53b8..922918ef50b 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -377,6 +377,16 @@ describe('Notes Store mutations', () => {
     });
   });
 
+  describe('SET_RESOLVING_DISCUSSION', () => {
+    it('should set resolving discussion state', () => {
+      const state = {};
+
+      mutations.SET_RESOLVING_DISCUSSION(state, true);
+
+      expect(state.isResolvingDiscussion).toEqual(true);
+    });
+  });
+
   describe('UPDATE_NOTE', () => {
     it('should update a note', () => {
       const state = {