diff --git a/app/assets/javascripts/import/fogbugz/app.vue b/app/assets/javascripts/import/fogbugz/import_from_fogbugz_app.vue similarity index 100% rename from app/assets/javascripts/import/fogbugz/app.vue rename to app/assets/javascripts/import/fogbugz/import_from_fogbugz_app.vue diff --git a/app/assets/javascripts/import/fogbugz/index.js b/app/assets/javascripts/import/fogbugz/index.js index 011a1a76ee7ca8082322c8651f0928b80b247201..d4ab22156ba1df22418d4f504fb00a778365d68b 100644 --- a/app/assets/javascripts/import/fogbugz/index.js +++ b/app/assets/javascripts/import/fogbugz/index.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import App from './app.vue'; +import ImportFromFogBugzApp from './import_from_fogbugz_app.vue'; export function initFogbugzImportProjectForm() { const el = document.getElementById('js-vue-import-fogbugz-project-app'); @@ -14,8 +14,9 @@ export function initFogbugzImportProjectForm() { return new Vue({ el, + name: 'ImportFromFogBugzRoot', render(createElement) { - return createElement(App, { props }); + return createElement(ImportFromFogBugzApp, { props }); }, }); } diff --git a/app/assets/javascripts/import/gitea/import_from_gitea_root.vue b/app/assets/javascripts/import/gitea/import_from_gitea_app.vue similarity index 100% rename from app/assets/javascripts/import/gitea/import_from_gitea_root.vue rename to app/assets/javascripts/import/gitea/import_from_gitea_app.vue diff --git a/app/assets/javascripts/import/gitea/index.js b/app/assets/javascripts/import/gitea/index.js index d305564679993a5d6a54de622b1664faad9fae95..e17420a924e45bd0b3e5b94b54692fd5cd372c19 100644 --- a/app/assets/javascripts/import/gitea/index.js +++ b/app/assets/javascripts/import/gitea/index.js @@ -1,5 +1,5 @@ import Vue from 'vue'; -import ImportFromGiteaRoot from './import_from_gitea_root.vue'; +import ImportFromGiteaApp from './import_from_gitea_app.vue'; export function initGiteaImportProjectForm() { const el = document.getElementById('js-vue-import-gitea-project-root'); @@ -16,7 +16,7 @@ export function initGiteaImportProjectForm() { el, name: 'ImportFromGiteaRoot', render(h) { - return h(ImportFromGiteaRoot, { props }); + return h(ImportFromGiteaApp, { props }); }, }); } diff --git a/spec/frontend/import/fogbugz/app_spec.js b/spec/frontend/import/fogbugz/import_from_fogbugz_app_spec.js similarity index 89% rename from spec/frontend/import/fogbugz/app_spec.js rename to spec/frontend/import/fogbugz/import_from_fogbugz_app_spec.js index a18508657d1102cd7aa6b87585c010d62315dce3..4633784df2613a66325176cef1e31e946ffd49eb 100644 --- a/spec/frontend/import/fogbugz/app_spec.js +++ b/spec/frontend/import/fogbugz/import_from_fogbugz_app_spec.js @@ -1,12 +1,12 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import App from '~/import/fogbugz/app.vue'; +import ImportFromFogbugzApp from '~/import/fogbugz/import_from_fogbugz_app.vue'; import MultiStepFormTemplate from '~/vue_shared/components/multi_step_form_template.vue'; describe('Import from FugBugz app', () => { let wrapper; const createComponent = () => { - wrapper = shallowMountExtended(App, { + wrapper = shallowMountExtended(ImportFromFogbugzApp, { propsData: { backButtonPath: '/projects/new#import_project', formPath: '/import/fogbugz/callback', diff --git a/spec/frontend/import/gitea/import_from_gitea_root_spec.js b/spec/frontend/import/gitea/import_from_gitea_app_spec.js similarity index 96% rename from spec/frontend/import/gitea/import_from_gitea_root_spec.js rename to spec/frontend/import/gitea/import_from_gitea_app_spec.js index d27bcbb760b113dcd322fdfef67ee89340340f65..723791acbb51f7dfaea82c719890eb2637f11b0b 100644 --- a/spec/frontend/import/gitea/import_from_gitea_root_spec.js +++ b/spec/frontend/import/gitea/import_from_gitea_app_spec.js @@ -1,7 +1,7 @@ import { nextTick } from 'vue'; import { GlFormInput } from '@gitlab/ui'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; -import ImportFromGiteaRoot from '~/import/gitea/import_from_gitea_root.vue'; +import ImportFromGiteaApp from '~/import/gitea/import_from_gitea_app.vue'; import MultiStepFormTemplate from '~/vue_shared/components/multi_step_form_template.vue'; jest.mock('~/lib/utils/csrf', () => ({ token: 'mock-csrf-token' })); @@ -16,7 +16,7 @@ describe('Import from Gitea app', () => { }; const createComponent = () => { - wrapper = shallowMountExtended(ImportFromGiteaRoot, { + wrapper = shallowMountExtended(ImportFromGiteaApp, { propsData: { ...defaultProps, },