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/vue_shared/components/diff_viewer | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/vue_shared/components/diff_viewer')
-rw-r--r-- | spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js b/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js index b6bffbcc6f3..eacc41ccdad 100644 --- a/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js +++ b/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js @@ -1,6 +1,6 @@ +import { mount } from '@vue/test-utils'; import Vue from 'vue'; import { compileToFunctions } from 'vue-template-compiler'; -import { mount } from '@vue/test-utils'; import { GREEN_BOX_IMAGE_URL, RED_BOX_IMAGE_URL } from 'spec/test_constants'; import imageDiffViewer from '~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue'; diff --git a/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js index e91e6577aaf..9f433816b34 100644 --- a/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js +++ b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js @@ -1,6 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; -import Renamed from '~/vue_shared/components/diff_viewer/viewers/renamed.vue'; +import Vuex from 'vuex'; import { TRANSITION_LOAD_START, TRANSITION_LOAD_ERROR, @@ -10,6 +9,7 @@ import { STATE_LOADING, STATE_ERRORED, } from '~/diffs/constants'; +import Renamed from '~/vue_shared/components/diff_viewer/viewers/renamed.vue'; const localVue = createLocalVue(); localVue.use(Vuex); |