diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 12:07:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 12:07:58 +0000 |
commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /spec/frontend/vue_mr_widget | |
parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) | |
download | gitlab-ce-93c6764dacd4c605027ef1cd367d3aebe420b223.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/vue_mr_widget')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js index 7d593a77bf3..f979d173eff 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js @@ -1,9 +1,9 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import { GlLoadingIcon } from '@gitlab/ui'; import { TEST_HOST } from 'helpers/test_constants'; +import axios from '~/lib/utils/axios_utils'; import ArtifactsListApp from '~/vue_merge_request_widget/components/artifacts_list_app.vue'; import createStore from '~/vue_merge_request_widget/stores/artifacts_list'; import { artifactsList } from './mock_data'; diff --git a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js index ee107f297ef..5f101ba4cf6 100644 --- a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_collapsible_extension.vue'; import { GlLoadingIcon } from '@gitlab/ui'; +import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_collapsible_extension.vue'; describe('Merge Request Collapsible Extension', () => { let wrapper; |