summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_shared
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-19 15:06:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-19 15:06:08 +0000
commitd948f526eaf995c32699fe9e02c2a7c47b78b635 (patch)
treef10023b5826989a5bdc756ec692b943796db48f8 /spec/javascripts/vue_shared
parent26804e91d92ce76b741103de6fd0012f9e26d18c (diff)
downloadgitlab-ce-d948f526eaf995c32699fe9e02c2a7c47b78b635.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/vue_shared')
-rw-r--r--spec/javascripts/vue_shared/components/deprecated_modal_2_spec.js (renamed from spec/javascripts/vue_shared/components/gl_modal_spec.js)14
1 files changed, 7 insertions, 7 deletions
diff --git a/spec/javascripts/vue_shared/components/gl_modal_spec.js b/spec/javascripts/vue_shared/components/deprecated_modal_2_spec.js
index 19af8b5d2f7..64fb984d9fc 100644
--- a/spec/javascripts/vue_shared/components/gl_modal_spec.js
+++ b/spec/javascripts/vue_shared/components/deprecated_modal_2_spec.js
@@ -1,11 +1,11 @@
import $ from 'jquery';
import Vue from 'vue';
-import GlModal from '~/vue_shared/components/gl_modal.vue';
+import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
-const modalComponent = Vue.extend(GlModal);
+const modalComponent = Vue.extend(DeprecatedModal2);
-describe('GlModal', () => {
+describe('DeprecatedModal2', () => {
let vm;
afterEach(() => {
@@ -153,17 +153,17 @@ describe('GlModal', () => {
let template;
if (slotName) {
template = `
- <gl-modal>
+ <deprecated-modal-2>
<template slot="${slotName}">${slotContent}</template>
- </gl-modal>
+ </deprecated-modal-2>
`;
} else {
- template = `<gl-modal>${slotContent}</gl-modal>`;
+ template = `<deprecated-modal-2>${slotContent}</deprecated-modal-2>`;
}
return Vue.extend({
components: {
- GlModal,
+ DeprecatedModal2,
},
template,
});