Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 64 deletions

diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index 4a1d42647f8..69c6b7d4a14 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -174,10 +174,10 @@ describe('Actions Notes Store', () => {
       axiosMock.onAny().reply(200, {});
     });
 
-    describe('closeIssue', () => {
+    describe('closeMergeRequest', () => {
       it('sets state as closed', done => {
         store
-          .dispatch('closeIssue', { notesData: { closeIssuePath: '' } })
+          .dispatch('closeMergeRequest', { notesData: { closeIssuePath: '' } })
           .then(() => {
             expect(store.state.noteableData.state).toEqual('closed');
             expect(store.state.isToggleStateButtonLoading).toEqual(false);
@@ -187,10 +187,10 @@ describe('Actions Notes Store', () => {
       });
     });
 
-    describe('reopenIssue', () => {
+    describe('reopenMergeRequest', () => {
       it('sets state as reopened', done => {
         store
-          .dispatch('reopenIssue', { notesData: { reopenIssuePath: '' } })
+          .dispatch('reopenMergeRequest', { notesData: { reopenIssuePath: '' } })
           .then(() => {
             expect(store.state.noteableData.state).toEqual('reopened');
             expect(store.state.isToggleStateButtonLoading).toEqual(false);
@@ -253,30 +253,6 @@ describe('Actions Notes Store', () => {
     });
   });
 
-  describe('toggleBlockedIssueWarning', () => {
-    it('should set issue warning as true', done => {
-      testAction(
-        actions.toggleBlockedIssueWarning,
-        true,
-        {},
-        [{ type: 'TOGGLE_BLOCKED_ISSUE_WARNING', payload: true }],
-        [],
-        done,
-      );
-    });
-
-    it('should set issue warning as false', done => {
-      testAction(
-        actions.toggleBlockedIssueWarning,
-        false,
-        {},
-        [{ type: 'TOGGLE_BLOCKED_ISSUE_WARNING', payload: false }],
-        [],
-        done,
-      );
-    });
-  });
-
   describe('fetchData', () => {
     describe('given there are no notes', () => {
       const lastFetchedAt = '13579';
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index 922918ef50b..ec4de925721 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -697,42 +697,6 @@ describe('Notes Store mutations', () => {
     });
   });
 
-  describe('TOGGLE_BLOCKED_ISSUE_WARNING', () => {
-    it('should set isToggleBlockedIssueWarning as true', () => {
-      const state = {
-        discussions: [],
-        targetNoteHash: null,
-        lastFetchedAt: null,
-        isToggleStateButtonLoading: false,
-        isToggleBlockedIssueWarning: false,
-        notesData: {},
-        userData: {},
-        noteableData: {},
-      };
-
-      mutations.TOGGLE_BLOCKED_ISSUE_WARNING(state, true);
-
-      expect(state.isToggleBlockedIssueWarning).toEqual(true);
-    });
-
-    it('should set isToggleBlockedIssueWarning as false', () => {
-      const state = {
-        discussions: [],
-        targetNoteHash: null,
-        lastFetchedAt: null,
-        isToggleStateButtonLoading: false,
-        isToggleBlockedIssueWarning: true,
-        notesData: {},
-        userData: {},
-        noteableData: {},
-      };
-
-      mutations.TOGGLE_BLOCKED_ISSUE_WARNING(state, false);
-
-      expect(state.isToggleBlockedIssueWarning).toEqual(false);
-    });
-  });
-
   describe('SET_APPLYING_BATCH_STATE', () => {
     const buildDiscussions = suggestionsInfo => {
       const suggestions = suggestionsInfo.map(({ suggestionId }) => ({ id: suggestionId }));