Add latest changes from gitlab-org/gitlab@master

3 files changed, 1 insertions, 1018 deletions

diff --git a/spec/javascripts/notes/helpers.js b/spec/javascripts/notes/helpers.js
index 3f349b40ba5..7bcba609311 100644
--- a/spec/javascripts/notes/helpers.js
+++ b/spec/javascripts/notes/helpers.js
@@ -1,12 +1 @@
-// eslint-disable-next-line import/prefer-default-export
-export const resetStore = store => {
-  store.replaceState({
-    notes: [],
-    targetNoteHash: null,
-    lastFetchedAt: null,
-
-    notesData: {},
-    userData: {},
-    noteableData: {},
-  });
-};
+export * from '../../frontend/notes/helpers.js';
diff --git a/spec/javascripts/notes/stores/actions_spec.js b/spec/javascripts/notes/stores/actions_spec.js
deleted file mode 100644
index ec1f1392845..00000000000
--- a/spec/javascripts/notes/stores/actions_spec.js
+++ /dev/null
@@ -1,911 +0,0 @@
-import $ from 'jquery';
-import { TEST_HOST } from 'spec/test_constants';
-import AxiosMockAdapter from 'axios-mock-adapter';
-import Api from '~/api';
-import actionsModule, * as actions from '~/notes/stores/actions';
-import * as mutationTypes from '~/notes/stores/mutation_types';
-import * as notesConstants from '~/notes/constants';
-import createStore from '~/notes/stores';
-import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub';
-import testAction from '../../helpers/vuex_action_helper';
-import { resetStore } from '../helpers';
-import {
-  discussionMock,
-  notesDataMock,
-  userDataMock,
-  noteableDataMock,
-  individualNote,
-} from '../mock_data';
-import axios from '~/lib/utils/axios_utils';
-
-const TEST_ERROR_MESSAGE = 'Test error message';
-
-describe('Actions Notes Store', () => {
-  let commit;
-  let dispatch;
-  let state;
-  let store;
-  let flashSpy;
-  let axiosMock;
-
-  beforeEach(() => {
-    store = createStore();
-    commit = jasmine.createSpy('commit');
-    dispatch = jasmine.createSpy('dispatch');
-    state = {};
-    flashSpy = spyOnDependency(actionsModule, 'Flash');
-    axiosMock = new AxiosMockAdapter(axios);
-  });
-
-  afterEach(() => {
-    resetStore(store);
-    axiosMock.restore();
-  });
-
-  describe('setNotesData', () => {
-    it('should set received notes data', done => {
-      testAction(
-        actions.setNotesData,
-        notesDataMock,
-        { notesData: {} },
-        [{ type: 'SET_NOTES_DATA', payload: notesDataMock }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('setNoteableData', () => {
-    it('should set received issue data', done => {
-      testAction(
-        actions.setNoteableData,
-        noteableDataMock,
-        { noteableData: {} },
-        [{ type: 'SET_NOTEABLE_DATA', payload: noteableDataMock }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('setUserData', () => {
-    it('should set received user data', done => {
-      testAction(
-        actions.setUserData,
-        userDataMock,
-        { userData: {} },
-        [{ type: 'SET_USER_DATA', payload: userDataMock }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('setLastFetchedAt', () => {
-    it('should set received timestamp', done => {
-      testAction(
-        actions.setLastFetchedAt,
-        'timestamp',
-        { lastFetchedAt: {} },
-        [{ type: 'SET_LAST_FETCHED_AT', payload: 'timestamp' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('setInitialNotes', () => {
-    it('should set initial notes', done => {
-      testAction(
-        actions.setInitialNotes,
-        [individualNote],
-        { notes: [] },
-        [{ type: 'SET_INITIAL_DISCUSSIONS', payload: [individualNote] }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('setTargetNoteHash', () => {
-    it('should set target note hash', done => {
-      testAction(
-        actions.setTargetNoteHash,
-        'hash',
-        { notes: [] },
-        [{ type: 'SET_TARGET_NOTE_HASH', payload: 'hash' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('toggleDiscussion', () => {
-    it('should toggle discussion', done => {
-      testAction(
-        actions.toggleDiscussion,
-        { discussionId: discussionMock.id },
-        { notes: [discussionMock] },
-        [{ type: 'TOGGLE_DISCUSSION', payload: { discussionId: discussionMock.id } }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('expandDiscussion', () => {
-    it('should expand discussion', done => {
-      testAction(
-        actions.expandDiscussion,
-        { discussionId: discussionMock.id },
-        { notes: [discussionMock] },
-        [{ type: 'EXPAND_DISCUSSION', payload: { discussionId: discussionMock.id } }],
-        [{ type: 'diffs/renderFileForDiscussionId', payload: discussionMock.id }],
-        done,
-      );
-    });
-  });
-
-  describe('collapseDiscussion', () => {
-    it('should commit collapse discussion', done => {
-      testAction(
-        actions.collapseDiscussion,
-        { discussionId: discussionMock.id },
-        { notes: [discussionMock] },
-        [{ type: 'COLLAPSE_DISCUSSION', payload: { discussionId: discussionMock.id } }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('async methods', () => {
-    beforeEach(() => {
-      axiosMock.onAny().reply(200, {});
-    });
-
-    describe('closeIssue', () => {
-      it('sets state as closed', done => {
-        store
-          .dispatch('closeIssue', { notesData: { closeIssuePath: '' } })
-          .then(() => {
-            expect(store.state.noteableData.state).toEqual('closed');
-            expect(store.state.isToggleStateButtonLoading).toEqual(false);
-            done();
-          })
-          .catch(done.fail);
-      });
-    });
-
-    describe('reopenIssue', () => {
-      it('sets state as reopened', done => {
-        store
-          .dispatch('reopenIssue', { notesData: { reopenIssuePath: '' } })
-          .then(() => {
-            expect(store.state.noteableData.state).toEqual('reopened');
-            expect(store.state.isToggleStateButtonLoading).toEqual(false);
-            done();
-          })
-          .catch(done.fail);
-      });
-    });
-  });
-
-  describe('emitStateChangedEvent', () => {
-    it('emits an event on the document', () => {
-      document.addEventListener('issuable_vue_app:change', event => {
-        expect(event.detail.data).toEqual({ id: '1', state: 'closed' });
-        expect(event.detail.isClosed).toEqual(false);
-      });
-
-      store.dispatch('emitStateChangedEvent', { id: '1', state: 'closed' });
-    });
-  });
-
-  describe('toggleStateButtonLoading', () => {
-    it('should set loading as true', done => {
-      testAction(
-        actions.toggleStateButtonLoading,
-        true,
-        {},
-        [{ type: 'TOGGLE_STATE_BUTTON_LOADING', payload: true }],
-        [],
-        done,
-      );
-    });
-
-    it('should set loading as false', done => {
-      testAction(
-        actions.toggleStateButtonLoading,
-        false,
-        {},
-        [{ type: 'TOGGLE_STATE_BUTTON_LOADING', payload: false }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('toggleIssueLocalState', () => {
-    it('sets issue state as closed', done => {
-      testAction(actions.toggleIssueLocalState, 'closed', {}, [{ type: 'CLOSE_ISSUE' }], [], done);
-    });
-
-    it('sets issue state as reopened', done => {
-      testAction(
-        actions.toggleIssueLocalState,
-        'reopened',
-        {},
-        [{ type: 'REOPEN_ISSUE' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('poll', () => {
-    beforeEach(done => {
-      jasmine.clock().install();
-
-      spyOn(axios, 'get').and.callThrough();
-
-      store
-        .dispatch('setNotesData', notesDataMock)
-        .then(done)
-        .catch(done.fail);
-    });
-
-    afterEach(() => {
-      jasmine.clock().uninstall();
-    });
-
-    it('calls service with last fetched state', done => {
-      axiosMock
-        .onAny()
-        .reply(200, { notes: [], last_fetched_at: '123456' }, { 'poll-interval': '1000' });
-
-      store
-        .dispatch('poll')
-        .then(() => new Promise(resolve => requestAnimationFrame(resolve)))
-        .then(() => {
-          expect(axios.get).toHaveBeenCalled();
-          expect(store.state.lastFetchedAt).toBe('123456');
-
-          jasmine.clock().tick(1500);
-        })
-        .then(
-          () =>
-            new Promise(resolve => {
-              requestAnimationFrame(resolve);
-            }),
-        )
-        .then(() => {
-          expect(axios.get.calls.count()).toBe(2);
-          expect(axios.get.calls.mostRecent().args[1].headers).toEqual({
-            'X-Last-Fetched-At': '123456',
-          });
-        })
-        .then(() => store.dispatch('stopPolling'))
-        .then(done)
-        .catch(done.fail);
-    });
-  });
-
-  describe('setNotesFetchedState', () => {
-    it('should set notes fetched state', done => {
-      testAction(
-        actions.setNotesFetchedState,
-        true,
-        {},
-        [{ type: 'SET_NOTES_FETCHED_STATE', payload: true }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('removeNote', () => {
-    const endpoint = `${TEST_HOST}/note`;
-
-    beforeEach(() => {
-      axiosMock.onDelete(endpoint).replyOnce(200, {});
-
-      $('body').attr('data-page', '');
-    });
-
-    afterEach(() => {
-      axiosMock.restore();
-
-      $('body').attr('data-page', '');
-    });
-
-    it('commits DELETE_NOTE and dispatches updateMergeRequestWidget', done => {
-      const note = { path: endpoint, id: 1 };
-
-      testAction(
-        actions.removeNote,
-        note,
-        store.state,
-        [
-          {
-            type: 'DELETE_NOTE',
-            payload: note,
-          },
-        ],
-        [
-          {
-            type: 'updateMergeRequestWidget',
-          },
-          {
-            type: 'updateResolvableDiscussionsCounts',
-          },
-        ],
-        done,
-      );
-    });
-
-    it('dispatches removeDiscussionsFromDiff on merge request page', done => {
-      const note = { path: endpoint, id: 1 };
-
-      $('body').attr('data-page', 'projects:merge_requests:show');
-
-      testAction(
-        actions.removeNote,
-        note,
-        store.state,
-        [
-          {
-            type: 'DELETE_NOTE',
-            payload: note,
-          },
-        ],
-        [
-          {
-            type: 'updateMergeRequestWidget',
-          },
-          {
-            type: 'updateResolvableDiscussionsCounts',
-          },
-          {
-            type: 'diffs/removeDiscussionsFromDiff',
-          },
-        ],
-        done,
-      );
-    });
-  });
-
-  describe('deleteNote', () => {
-    const endpoint = `${TEST_HOST}/note`;
-
-    beforeEach(() => {
-      axiosMock.onDelete(endpoint).replyOnce(200, {});
-
-      $('body').attr('data-page', '');
-    });
-
-    afterEach(() => {
-      axiosMock.restore();
-
-      $('body').attr('data-page', '');
-    });
-
-    it('dispatches removeNote', done => {
-      const note = { path: endpoint, id: 1 };
-
-      testAction(
-        actions.deleteNote,
-        note,
-        {},
-        [],
-        [
-          {
-            type: 'removeNote',
-            payload: {
-              id: 1,
-              path: 'http://test.host/note',
-            },
-          },
-        ],
-        done,
-      );
-    });
-  });
-
-  describe('createNewNote', () => {
-    describe('success', () => {
-      const res = {
-        id: 1,
-        valid: true,
-      };
-
-      beforeEach(() => {
-        axiosMock.onAny().reply(200, res);
-      });
-
-      it('commits ADD_NEW_NOTE and dispatches updateMergeRequestWidget', done => {
-        testAction(
-          actions.createNewNote,
-          { endpoint: `${gl.TEST_HOST}`, data: {} },
-          store.state,
-          [
-            {
-              type: 'ADD_NEW_NOTE',
-              payload: res,
-            },
-          ],
-          [
-            {
-              type: 'updateMergeRequestWidget',
-            },
-            {
-              type: 'startTaskList',
-            },
-            {
-              type: 'updateResolvableDiscussionsCounts',
-            },
-          ],
-          done,
-        );
-      });
-    });
-
-    describe('error', () => {
-      const res = {
-        errors: ['error'],
-      };
-
-      beforeEach(() => {
-        axiosMock.onAny().replyOnce(200, res);
-      });
-
-      it('does not commit ADD_NEW_NOTE or dispatch updateMergeRequestWidget', done => {
-        testAction(
-          actions.createNewNote,
-          { endpoint: `${gl.TEST_HOST}`, data: {} },
-          store.state,
-          [],
-          [],
-          done,
-        );
-      });
-    });
-  });
-
-  describe('toggleResolveNote', () => {
-    const res = {
-      resolved: true,
-    };
-
-    beforeEach(() => {
-      axiosMock.onAny().reply(200, res);
-    });
-
-    describe('as note', () => {
-      it('commits UPDATE_NOTE and dispatches updateMergeRequestWidget', done => {
-        testAction(
-          actions.toggleResolveNote,
-          { endpoint: `${gl.TEST_HOST}`, isResolved: true, discussion: false },
-          store.state,
-          [
-            {
-              type: 'UPDATE_NOTE',
-              payload: res,
-            },
-          ],
-          [
-            {
-              type: 'updateResolvableDiscussionsCounts',
-            },
-            {
-              type: 'updateMergeRequestWidget',
-            },
-          ],
-          done,
-        );
-      });
-    });
-
-    describe('as discussion', () => {
-      it('commits UPDATE_DISCUSSION and dispatches updateMergeRequestWidget', done => {
-        testAction(
-          actions.toggleResolveNote,
-          { endpoint: `${gl.TEST_HOST}`, isResolved: true, discussion: true },
-          store.state,
-          [
-            {
-              type: 'UPDATE_DISCUSSION',
-              payload: res,
-            },
-          ],
-          [
-            {
-              type: 'updateResolvableDiscussionsCounts',
-            },
-            {
-              type: 'updateMergeRequestWidget',
-            },
-          ],
-          done,
-        );
-      });
-    });
-  });
-
-  describe('updateMergeRequestWidget', () => {
-    it('calls mrWidget checkStatus', () => {
-      spyOn(mrWidgetEventHub, '$emit');
-
-      actions.updateMergeRequestWidget();
-
-      expect(mrWidgetEventHub.$emit).toHaveBeenCalledWith('mr.discussion.updated');
-    });
-  });
-
-  describe('setCommentsDisabled', () => {
-    it('should set comments disabled state', done => {
-      testAction(
-        actions.setCommentsDisabled,
-        true,
-        null,
-        [{ type: 'DISABLE_COMMENTS', payload: true }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('updateResolvableDiscussionsCounts', () => {
-    it('commits UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS', done => {
-      testAction(
-        actions.updateResolvableDiscussionsCounts,
-        null,
-        {},
-        [{ type: 'UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS' }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('convertToDiscussion', () => {
-    it('commits CONVERT_TO_DISCUSSION with noteId', done => {
-      const noteId = 'dummy-note-id';
-      testAction(
-        actions.convertToDiscussion,
-        noteId,
-        {},
-        [{ type: 'CONVERT_TO_DISCUSSION', payload: noteId }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('updateOrCreateNotes', () => {
-    it('Updates existing note', () => {
-      const note = { id: 1234 };
-      const getters = { notesById: { 1234: note } };
-
-      actions.updateOrCreateNotes({ commit, state, getters, dispatch }, [note]);
-
-      expect(commit.calls.allArgs()).toEqual([[mutationTypes.UPDATE_NOTE, note]]);
-    });
-
-    it('Creates a new note if none exisits', () => {
-      const note = { id: 1234 };
-      const getters = { notesById: {} };
-      actions.updateOrCreateNotes({ commit, state, getters, dispatch }, [note]);
-
-      expect(commit.calls.allArgs()).toEqual([[mutationTypes.ADD_NEW_NOTE, note]]);
-    });
-
-    describe('Discussion notes', () => {
-      let note;
-      let getters;
-
-      beforeEach(() => {
-        note = { id: 1234 };
-        getters = { notesById: {} };
-      });
-
-      it('Adds a reply to an existing discussion', () => {
-        state = { discussions: [note] };
-        const discussionNote = {
-          ...note,
-          type: notesConstants.DISCUSSION_NOTE,
-          discussion_id: 1234,
-        };
-
-        actions.updateOrCreateNotes({ commit, state, getters, dispatch }, [discussionNote]);
-
-        expect(commit.calls.allArgs()).toEqual([
-          [mutationTypes.ADD_NEW_REPLY_TO_DISCUSSION, discussionNote],
-        ]);
-      });
-
-      it('fetches discussions for diff notes', () => {
-        state = { discussions: [], notesData: { discussionsPath: 'Hello world' } };
-        const diffNote = { ...note, type: notesConstants.DIFF_NOTE, discussion_id: 1234 };
-
-        actions.updateOrCreateNotes({ commit, state, getters, dispatch }, [diffNote]);
-
-        expect(dispatch.calls.allArgs()).toEqual([
-          ['fetchDiscussions', { path: state.notesData.discussionsPath }],
-        ]);
-      });
-
-      it('Adds a new note', () => {
-        state = { discussions: [] };
-        const discussionNote = {
-          ...note,
-          type: notesConstants.DISCUSSION_NOTE,
-          discussion_id: 1234,
-        };
-
-        actions.updateOrCreateNotes({ commit, state, getters, dispatch }, [discussionNote]);
-
-        expect(commit.calls.allArgs()).toEqual([[mutationTypes.ADD_NEW_NOTE, discussionNote]]);
-      });
-    });
-  });
-
-  describe('replyToDiscussion', () => {
-    const payload = { endpoint: TEST_HOST, data: {} };
-
-    it('updates discussion if response contains disussion', done => {
-      const discussion = { notes: [] };
-      axiosMock.onAny().reply(200, { discussion });
-
-      testAction(
-        actions.replyToDiscussion,
-        payload,
-        {
-          notesById: {},
-        },
-        [{ type: mutationTypes.UPDATE_DISCUSSION, payload: discussion }],
-        [
-          { type: 'updateMergeRequestWidget' },
-          { type: 'startTaskList' },
-          { type: 'updateResolvableDiscussionsCounts' },
-        ],
-        done,
-      );
-    });
-
-    it('adds a reply to a discussion', done => {
-      const res = {};
-      axiosMock.onAny().reply(200, res);
-
-      testAction(
-        actions.replyToDiscussion,
-        payload,
-        {
-          notesById: {},
-        },
-        [{ type: mutationTypes.ADD_NEW_REPLY_TO_DISCUSSION, payload: res }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('removeConvertedDiscussion', () => {
-    it('commits CONVERT_TO_DISCUSSION with noteId', done => {
-      const noteId = 'dummy-id';
-      testAction(
-        actions.removeConvertedDiscussion,
-        noteId,
-        {},
-        [{ type: 'REMOVE_CONVERTED_DISCUSSION', payload: noteId }],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('resolveDiscussion', () => {
-    let getters;
-    let discussionId;
-
-    beforeEach(() => {
-      discussionId = discussionMock.id;
-      state.discussions = [discussionMock];
-      getters = {
-        isDiscussionResolved: () => false,
-      };
-    });
-
-    it('when unresolved, dispatches action', done => {
-      testAction(
-        actions.resolveDiscussion,
-        { discussionId },
-        { ...state, ...getters },
-        [],
-        [
-          {
-            type: 'toggleResolveNote',
-            payload: {
-              endpoint: discussionMock.resolve_path,
-              isResolved: false,
-              discussion: true,
-            },
-          },
-        ],
-        done,
-      );
-    });
-
-    it('when resolved, does nothing', done => {
-      getters.isDiscussionResolved = id => id === discussionId;
-
-      testAction(
-        actions.resolveDiscussion,
-        { discussionId },
-        { ...state, ...getters },
-        [],
-        [],
-        done,
-      );
-    });
-  });
-
-  describe('saveNote', () => {
-    const flashContainer = {};
-    const payload = { endpoint: TEST_HOST, data: { 'note[note]': 'some text' }, flashContainer };
-
-    describe('if response contains errors', () => {
-      const res = { errors: { something: ['went wrong'] } };
-      const error = { message: 'Unprocessable entity', response: { data: res } };
-
-      it('throws an error', done => {
-        actions
-          .saveNote(
-            {
-              commit() {},
-              dispatch: () => Promise.reject(error),
-            },
-            payload,
-          )
-          .then(() => done.fail('Expected error to be thrown!'))
-          .catch(err => {
-            expect(err).toBe(error);
-            expect(flashSpy).not.toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-    });
-
-    describe('if response contains errors.base', () => {
-      const res = { errors: { base: ['something went wrong'] } };
-      const error = { message: 'Unprocessable entity', response: { data: res } };
-
-      it('sets flash alert using errors.base message', done => {
-        actions
-          .saveNote(
-            {
-              commit() {},
-              dispatch: () => Promise.reject(error),
-            },
-            { ...payload, flashContainer },
-          )
-          .then(resp => {
-            expect(resp.hasFlash).toBe(true);
-            expect(flashSpy).toHaveBeenCalledWith(
-              'Your comment could not be submitted because something went wrong',
-              'alert',
-              flashContainer,
-            );
-          })
-          .catch(() => done.fail('Expected success response!'))
-          .then(done)
-          .catch(done.fail);
-      });
-    });
-
-    describe('if response contains no errors', () => {
-      const res = { valid: true };
-
-      it('returns the response', done => {
-        actions
-          .saveNote(
-            {
-              commit() {},
-              dispatch: () => Promise.resolve(res),
-            },
-            payload,
-          )
-          .then(data => {
-            expect(data).toBe(res);
-            expect(flashSpy).not.toHaveBeenCalled();
-          })
-          .then(done)
-          .catch(done.fail);
-      });
-    });
-  });
-
-  describe('submitSuggestion', () => {
-    const discussionId = 'discussion-id';
-    const noteId = 'note-id';
-    const suggestionId = 'suggestion-id';
-    let flashContainer;
-
-    beforeEach(() => {
-      spyOn(Api, 'applySuggestion');
-      dispatch.and.returnValue(Promise.resolve());
-      Api.applySuggestion.and.returnValue(Promise.resolve());
-      flashContainer = {};
-    });
-
-    const testSubmitSuggestion = (done, expectFn) => {
-      actions
-        .submitSuggestion(
-          { commit, dispatch },
-          { discussionId, noteId, suggestionId, flashContainer },
-        )
-        .then(expectFn)
-        .then(done)
-        .catch(done.fail);
-    };
-
-    it('when service success, commits and resolves discussion', done => {
-      testSubmitSuggestion(done, () => {
-        expect(commit.calls.allArgs()).toEqual([
-          [mutationTypes.APPLY_SUGGESTION, { discussionId, noteId, suggestionId }],
-        ]);
-
-        expect(dispatch.calls.allArgs()).toEqual([['resolveDiscussion', { discussionId }]]);
-        expect(flashSpy).not.toHaveBeenCalled();
-      });
-    });
-
-    it('when service fails, flashes error message', done => {
-      const response = { response: { data: { message: TEST_ERROR_MESSAGE } } };
-
-      Api.applySuggestion.and.returnValue(Promise.reject(response));
-
-      testSubmitSuggestion(done, () => {
-        expect(commit).not.toHaveBeenCalled();
-        expect(dispatch).not.toHaveBeenCalled();
-        expect(flashSpy).toHaveBeenCalledWith(`${TEST_ERROR_MESSAGE}.`, 'alert', flashContainer);
-      });
-    });
-
-    it('when resolve discussion fails, fail gracefully', done => {
-      dispatch.and.returnValue(Promise.reject());
-
-      testSubmitSuggestion(done, () => {
-        expect(flashSpy).not.toHaveBeenCalled();
-      });
-    });
-  });
-
-  describe('filterDiscussion', () => {
-    const path = 'some-discussion-path';
-    const filter = 0;
-
-    beforeEach(() => {
-      dispatch.and.returnValue(new Promise(() => {}));
-    });
-
-    it('fetches discussions with filter and persistFilter false', () => {
-      actions.filterDiscussion({ dispatch }, { path, filter, persistFilter: false });
-
-      expect(dispatch.calls.allArgs()).toEqual([
-        ['setLoadingState', true],
-        ['fetchDiscussions', { path, filter, persistFilter: false }],
-      ]);
-    });
-
-    it('fetches discussions with filter and persistFilter true', () => {
-      actions.filterDiscussion({ dispatch }, { path, filter, persistFilter: true });
-
-      expect(dispatch.calls.allArgs()).toEqual([
-        ['setLoadingState', true],
-        ['fetchDiscussions', { path, filter, persistFilter: true }],
-      ]);
-    });
-  });
-});
diff --git a/spec/javascripts/vue_mr_widget/components/deployment_stop_button_spec.js b/spec/javascripts/vue_mr_widget/components/deployment_stop_button_spec.js
deleted file mode 100644
index 6a6d8279c2c..00000000000
--- a/spec/javascripts/vue_mr_widget/components/deployment_stop_button_spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import Vue from 'vue';
-import deploymentStopComponent from '~/vue_merge_request_widget/components/deployment/deployment_stop_button.vue';
-import { SUCCESS } from '~/vue_merge_request_widget/components/deployment/constants';
-import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
-import mountComponent from '../../helpers/vue_mount_component_helper';
-
-describe('Deployment component', () => {
-  const Component = Vue.extend(deploymentStopComponent);
-  let deploymentMockData;
-
-  beforeEach(() => {
-    deploymentMockData = {
-      id: 15,
-      name: 'review/diplo',
-      url: '/root/review-apps/environments/15',
-      stop_url: '/root/review-apps/environments/15/stop',
-      metrics_url: '/root/review-apps/environments/15/deployments/1/metrics',
-      metrics_monitoring_url: '/root/review-apps/environments/15/metrics',
-      external_url: 'http://gitlab.com.',
-      external_url_formatted: 'gitlab',
-      deployed_at: '2017-03-22T22:44:42.258Z',
-      deployed_at_formatted: 'Mar 22, 2017 10:44pm',
-      deployment_manual_actions: [],
-      status: SUCCESS,
-      changes: [
-        {
-          path: 'index.html',
-          external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/index.html',
-        },
-        {
-          path: 'imgs/gallery.html',
-          external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/imgs/gallery.html',
-        },
-        {
-          path: 'about/',
-          external_url: 'http://root-master-patch-91341.volatile-watch.surge.sh/about/',
-        },
-      ],
-    };
-  });
-
-  let vm;
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  describe('', () => {
-    beforeEach(() => {
-      vm = mountComponent(Component, {
-        stopUrl: deploymentMockData.stop_url,
-        isDeployInProgress: false,
-      });
-    });
-
-    describe('stopEnvironment', () => {
-      const url = '/foo/bar';
-      const returnPromise = () =>
-        new Promise(resolve => {
-          resolve({
-            data: {
-              redirect_url: url,
-            },
-          });
-        });
-      const mockStopEnvironment = () => {
-        vm.stopEnvironment(deploymentMockData);
-        return vm;
-      };
-
-      it('should show a confirm dialog and call service.stopEnvironment when confirmed', done => {
-        spyOn(window, 'confirm').and.returnValue(true);
-        spyOn(MRWidgetService, 'stopEnvironment').and.returnValue(returnPromise(true));
-        const visitUrl = spyOnDependency(deploymentStopComponent, 'visitUrl').and.returnValue(true);
-        vm = mockStopEnvironment();
-
-        expect(window.confirm).toHaveBeenCalled();
-        expect(MRWidgetService.stopEnvironment).toHaveBeenCalledWith(deploymentMockData.stop_url);
-        setTimeout(() => {
-          expect(visitUrl).toHaveBeenCalledWith(url);
-          done();
-        }, 333);
-      });
-
-      it('should show a confirm dialog but should not work if the dialog is rejected', () => {
-        spyOn(window, 'confirm').and.returnValue(false);
-        spyOn(MRWidgetService, 'stopEnvironment').and.returnValue(returnPromise(false));
-        vm = mockStopEnvironment();
-
-        expect(window.confirm).toHaveBeenCalled();
-        expect(MRWidgetService.stopEnvironment).not.toHaveBeenCalled();
-      });
-    });
-  });
-});