diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/frontend/add_context_commits_modal | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/add_context_commits_modal')
4 files changed, 7 insertions, 7 deletions
diff --git a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js index 1a3b151afa0..d32e582e498 100644 --- a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js +++ b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js @@ -1,12 +1,12 @@ +import { GlModal, GlSearchBoxByType } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlModal, GlSearchBoxByType } from '@gitlab/ui'; import AddReviewItemsModal from '~/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue'; -import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; -import defaultState from '~/add_context_commits_modal/store/state'; -import mutations from '~/add_context_commits_modal/store/mutations'; import * as actions from '~/add_context_commits_modal/store/actions'; +import mutations from '~/add_context_commits_modal/store/mutations'; +import defaultState from '~/add_context_commits_modal/store/state'; +import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js b/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js index 4e65713a680..75f1cc41e23 100644 --- a/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js +++ b/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; import CommitItem from '~/diffs/components/commit_item.vue'; import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; diff --git a/spec/frontend/add_context_commits_modal/store/actions_spec.js b/spec/frontend/add_context_commits_modal/store/actions_spec.js index 3bb3cb68f56..fa4d52cbfbb 100644 --- a/spec/frontend/add_context_commits_modal/store/actions_spec.js +++ b/spec/frontend/add_context_commits_modal/store/actions_spec.js @@ -1,7 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; import { setBaseConfig, setTabIndex, @@ -16,6 +15,7 @@ import { resetModalState, } from '~/add_context_commits_modal/store/actions'; import * as types from '~/add_context_commits_modal/store/mutation_types'; +import axios from '~/lib/utils/axios_utils'; describe('AddContextCommitsModalStoreActions', () => { const contextCommitEndpoint = diff --git a/spec/frontend/add_context_commits_modal/store/mutations_spec.js b/spec/frontend/add_context_commits_modal/store/mutations_spec.js index 22f82570ab1..2331a4af1bc 100644 --- a/spec/frontend/add_context_commits_modal/store/mutations_spec.js +++ b/spec/frontend/add_context_commits_modal/store/mutations_spec.js @@ -1,6 +1,6 @@ import { TEST_HOST } from 'helpers/test_constants'; -import mutations from '~/add_context_commits_modal/store/mutations'; import * as types from '~/add_context_commits_modal/store/mutation_types'; +import mutations from '~/add_context_commits_modal/store/mutations'; import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; describe('AddContextCommitsModalStoreMutations', () => { |