summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-23 09:22:20 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-03-23 09:22:20 +0000
commit963e445f58f1cbe03f821167a3bf1d0b8cc8a56d (patch)
tree36676c69deccb16b030d01f93cf86b9f74a0f305 /spec
parent28be04784860b417c94311b2805f82c4789937a1 (diff)
parent07487628f4c900f4eb09e3cf11a525be0498bd58 (diff)
downloadgitlab-ce-963e445f58f1cbe03f821167a3bf1d0b8cc8a56d.tar.gz
Merge branch 'winh-deprecate-old-modal' into 'master'
Rename modal.vue to deprecated_modal.vue See merge request gitlab-org/gitlab-ce!17438
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/vue_shared/components/deprecated_modal_spec.js (renamed from spec/javascripts/vue_shared/components/modal_spec.js)6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/vue_shared/components/modal_spec.js b/spec/javascripts/vue_shared/components/deprecated_modal_spec.js
index d01a94c25e5..59d4e549a91 100644
--- a/spec/javascripts/vue_shared/components/modal_spec.js
+++ b/spec/javascripts/vue_shared/components/deprecated_modal_spec.js
@@ -1,11 +1,11 @@
import $ from 'jquery';
import Vue from 'vue';
-import modal from '~/vue_shared/components/modal.vue';
+import DeprecatedModal from '~/vue_shared/components/deprecated_modal.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
-const modalComponent = Vue.extend(modal);
+const modalComponent = Vue.extend(DeprecatedModal);
-describe('Modal', () => {
+describe('DeprecatedModal', () => {
let vm;
afterEach(() => {