diff options
Diffstat (limited to 'spec/frontend/ide/stores')
9 files changed, 15 insertions, 12 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', () => { diff --git a/spec/frontend/ide/stores/actions/project_spec.js b/spec/frontend/ide/stores/actions/project_spec.js index 64024c12903..ca3687307a9 100644 --- a/spec/frontend/ide/stores/actions/project_spec.js +++ b/spec/frontend/ide/stores/actions/project_spec.js @@ -1,4 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; +import testAction from 'helpers/vuex_action_helper'; +import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; import axios from '~/lib/utils/axios_utils'; import { createStore } from '~/ide/stores'; import { @@ -12,8 +14,6 @@ import { } from '~/ide/stores/actions'; import service from '~/ide/services'; import api from '~/api'; -import testAction from 'helpers/vuex_action_helper'; -import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; const TEST_PROJECT_ID = 'abc/def'; diff --git a/spec/frontend/ide/stores/actions/tree_spec.js b/spec/frontend/ide/stores/actions/tree_spec.js index c20941843c4..0eabd982d57 100644 --- a/spec/frontend/ide/stores/actions/tree_spec.js +++ b/spec/frontend/ide/stores/actions/tree_spec.js @@ -1,5 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; +import { TEST_HOST } from 'jest/helpers/test_constants'; import { showTreeEntry, getFiles, setDirectoryData } from '~/ide/stores/actions/tree'; import * as types from '~/ide/stores/mutation_types'; import axios from '~/lib/utils/axios_utils'; @@ -7,7 +8,6 @@ import { createStore } from '~/ide/stores'; import service from '~/ide/services'; import { createRouter } from '~/ide/ide_router'; import { file, createEntriesFromPaths } from '../../helpers'; -import { TEST_HOST } from 'jest/helpers/test_constants'; describe('Multi-file store tree actions', () => { let projectTree; diff --git a/spec/frontend/ide/stores/modules/file_templates/getters_spec.js b/spec/frontend/ide/stores/modules/file_templates/getters_spec.js index 5855496a330..c9676b23fa1 100644 --- a/spec/frontend/ide/stores/modules/file_templates/getters_spec.js +++ b/spec/frontend/ide/stores/modules/file_templates/getters_spec.js @@ -5,7 +5,7 @@ import * as getters from '~/ide/stores/modules/file_templates/getters'; describe('IDE file templates getters', () => { describe('templateTypes', () => { it('returns list of template types', () => { - expect(getters.templateTypes().length).toBe(4); + expect(getters.templateTypes().length).toBe(5); }); }); diff --git a/spec/frontend/ide/stores/modules/router/actions_spec.js b/spec/frontend/ide/stores/modules/router/actions_spec.js index 4795eae2b79..1458a43da57 100644 --- a/spec/frontend/ide/stores/modules/router/actions_spec.js +++ b/spec/frontend/ide/stores/modules/router/actions_spec.js @@ -1,6 +1,6 @@ +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/ide/stores/modules/router/actions'; import * as types from '~/ide/stores/modules/router/mutation_types'; -import testAction from 'helpers/vuex_action_helper'; const TEST_PATH = 'test/path/abc'; diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js index 4bc937b4784..d0ac2af3ffd 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js @@ -6,7 +6,7 @@ import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; import * as actions from '~/ide/stores/modules/terminal/actions/session_controls'; import httpStatus from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js index 7909f828124..e25746e1dd1 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js @@ -5,7 +5,7 @@ import * as messages from '~/ide/stores/modules/terminal/messages'; import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; import * as actions from '~/ide/stores/modules/terminal/actions/session_status'; import axios from '~/lib/utils/axios_utils'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/ide/stores/modules/terminal/messages_spec.js b/spec/frontend/ide/stores/modules/terminal/messages_spec.js index 966158999da..1bb92a9dfa5 100644 --- a/spec/frontend/ide/stores/modules/terminal/messages_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/messages_spec.js @@ -15,6 +15,8 @@ describe('IDE store terminal messages', () => { sprintf( messages.ERROR_CONFIG, { + codeStart: `<code>`, + codeEnd: `</code>`, helpStart: `<a href="${escape(TEST_HELP_URL)}" target="_blank">`, helpEnd: '</a>', }, diff --git a/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js index ac976300ed0..3fa57bde415 100644 --- a/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js +++ b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js @@ -1,7 +1,7 @@ +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/ide/stores/modules/terminal_sync/actions'; import mirror, { canConnect, SERVICE_NAME } from '~/ide/lib/mirror'; import * as types from '~/ide/stores/modules/terminal_sync/mutation_types'; -import testAction from 'helpers/vuex_action_helper'; jest.mock('~/ide/lib/mirror'); |