summaryrefslogtreecommitdiff
path: root/spec/frontend/ide/stores/actions/merge_request_spec.js
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/ide/stores/actions/merge_request_spec.js')
-rw-r--r--spec/frontend/ide/stores/actions/merge_request_spec.js9
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/frontend/ide/stores/actions/merge_request_spec.js b/spec/frontend/ide/stores/actions/merge_request_spec.js
index e5c4f346459..62971b9cad6 100644
--- a/spec/frontend/ide/stores/actions/merge_request_spec.js
+++ b/spec/frontend/ide/stores/actions/merge_request_spec.js
@@ -1,7 +1,7 @@
import MockAdapter from 'axios-mock-adapter';
import axios from '~/lib/utils/axios_utils';
-import store from '~/ide/stores';
-import createFlash from '~/flash';
+import { createStore } from '~/ide/stores';
+import { deprecatedCreateFlash as createFlash } from '~/flash';
import {
getMergeRequestData,
getMergeRequestChanges,
@@ -10,7 +10,6 @@ import {
} from '~/ide/stores/actions/merge_request';
import service from '~/ide/services';
import { leftSidebarViews, PERMISSION_READ_MR } from '~/ide/constants';
-import { resetStore } from '../../helpers';
const TEST_PROJECT = 'abcproject';
const TEST_PROJECT_ID = 17;
@@ -18,9 +17,12 @@ const TEST_PROJECT_ID = 17;
jest.mock('~/flash');
describe('IDE store merge request actions', () => {
+ let store;
let mock;
beforeEach(() => {
+ store = createStore();
+
mock = new MockAdapter(axios);
store.state.projects[TEST_PROJECT] = {
@@ -34,7 +36,6 @@ describe('IDE store merge request actions', () => {
afterEach(() => {
mock.restore();
- resetStore(store);
});
describe('getMergeRequestsForBranch', () => {