From 97d4d926630822d0e1a638206909679c962d2f0a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 10 Dec 2019 09:07:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../import_projects/components/imported_project_table_row_spec.js | 2 +- spec/frontend/import_projects/store/actions_spec.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'spec/frontend/import_projects') diff --git a/spec/frontend/import_projects/components/imported_project_table_row_spec.js b/spec/frontend/import_projects/components/imported_project_table_row_spec.js index f95acc1edd7..34961eae0f3 100644 --- a/spec/frontend/import_projects/components/imported_project_table_row_spec.js +++ b/spec/frontend/import_projects/components/imported_project_table_row_spec.js @@ -1,6 +1,6 @@ import Vuex from 'vuex'; -import createStore from '~/import_projects/store'; import { createLocalVue, mount } from '@vue/test-utils'; +import createStore from '~/import_projects/store'; import importedProjectTableRow from '~/import_projects/components/imported_project_table_row.vue'; import STATUS_MAP from '~/import_projects/constants'; diff --git a/spec/frontend/import_projects/store/actions_spec.js b/spec/frontend/import_projects/store/actions_spec.js index 340b6f02d93..4954513715e 100644 --- a/spec/frontend/import_projects/store/actions_spec.js +++ b/spec/frontend/import_projects/store/actions_spec.js @@ -1,4 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; +import testAction from 'helpers/vuex_action_helper'; +import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { @@ -27,8 +29,6 @@ import { stopJobsPolling, } from '~/import_projects/store/actions'; import state from '~/import_projects/store/state'; -import testAction from 'helpers/vuex_action_helper'; -import { TEST_HOST } from 'helpers/test_constants'; describe('import_projects store actions', () => { let localState; -- cgit v1.2.3