Merge branch '196735-follow-up-from-payment-method-component-for-paid-signup-flow' into 'master'

Fix nested component directories

Closes #196735

See merge request gitlab-org/gitlab!23972

ee/app/assets/javascripts/subscriptions/new/components/checkout/billing_address.vue

@@ -4,7 +4,7 @@ import autofocusonshow from '~/vue_shared/directives/autofocusonshow';
 import { mapState, mapActions } from 'vuex';
 import { GlFormGroup, GlFormInput, GlFormSelect } from '@gitlab/ui';
 import { s__ } from '~/locale';
-import Step from './components/step.vue';
+import Step from './step.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/subscriptions/new/components/checkout/payment_method.vue

@@ -2,8 +2,8 @@
 import { GlSprintf } from '@gitlab/ui';
 import { sprintf, s__ } from '~/locale';
 import { mapState } from 'vuex';
-import Step from './components/step.vue';
-import Zuora from './components/zuora.vue';
+import Step from './step.vue';
+import Zuora from './zuora.vue';
 
 export default {
   components: {

ee/app/assets/javascripts/subscriptions/new/components/checkout/subscription_details.vue

@@ -4,7 +4,7 @@ import autofocusonshow from '~/vue_shared/directives/autofocusonshow';
 import { mapState, mapGetters, mapActions } from 'vuex';
 import { GlFormGroup, GlFormSelect, GlFormInput, GlSprintf, GlLink } from '@gitlab/ui';
 import { sprintf, s__ } from '~/locale';
-import Step from './components/step.vue';
+import Step from './step.vue';
 
 export default {
   components: {

ee/spec/frontend/subscriptions/new/components/checkout/billing_address_spec.js

@@ -2,7 +2,7 @@ import Vuex from 'vuex';
 import { mount, createLocalVue } from '@vue/test-utils';
 import createStore from 'ee/subscriptions/new/store';
 import * as types from 'ee/subscriptions/new/store/mutation_types';
-import Step from 'ee/subscriptions/new/components/checkout/components/step.vue';
+import Step from 'ee/subscriptions/new/components/checkout/step.vue';
 import Component from 'ee/subscriptions/new/components/checkout/billing_address.vue';
 
 describe('Billing Address', () => {

ee/spec/frontend/subscriptions/new/components/checkout/payment_method_spec.js

@@ -2,7 +2,7 @@ import Vuex from 'vuex';
 import { mount, createLocalVue } from '@vue/test-utils';
 import createStore from 'ee/subscriptions/new/store';
 import * as types from 'ee/subscriptions/new/store/mutation_types';
-import Step from 'ee/subscriptions/new/components/checkout/components/step.vue';
+import Step from 'ee/subscriptions/new/components/checkout/step.vue';
 import Component from 'ee/subscriptions/new/components/checkout/payment_method.vue';
 
 describe('Payment Method', () => {

ee/spec/frontend/subscriptions/new/components/checkout/components/step_spec.js → ee/spec/frontend/subscriptions/new/components/checkout/step_spec.js

@@ -3,8 +3,8 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlButton } from '@gitlab/ui';
 import createStore from 'ee/subscriptions/new/store';
 import * as constants from 'ee/subscriptions/new/constants';
-import Component from 'ee/subscriptions/new/components/checkout/components/step.vue';
-import StepSummary from 'ee/subscriptions/new/components/checkout/components/step_summary.vue';
+import Component from 'ee/subscriptions/new/components/checkout/step.vue';
+import StepSummary from 'ee/subscriptions/new/components/checkout/step_summary.vue';
 
 describe('Step', () => {
   const localVue = createLocalVue();

ee/spec/frontend/subscriptions/new/components/checkout/subscription_details_spec.js

@@ -2,7 +2,7 @@ import Vuex from 'vuex';
 import { mount, createLocalVue } from '@vue/test-utils';
 import createStore from 'ee/subscriptions/new/store';
 import * as types from 'ee/subscriptions/new/store/mutation_types';
-import Step from 'ee/subscriptions/new/components/checkout/components/step.vue';
+import Step from 'ee/subscriptions/new/components/checkout/step.vue';
 import Component from 'ee/subscriptions/new/components/checkout/subscription_details.vue';
 
 describe('Subscription Details', () => {

ee/spec/frontend/subscriptions/new/components/checkout/components/zuora_spec.js → ee/spec/frontend/subscriptions/new/components/checkout/zuora_spec.js

@@ -3,7 +3,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import createStore from 'ee/subscriptions/new/store';
 import * as types from 'ee/subscriptions/new/store/mutation_types';
 import { GlLoadingIcon } from '@gitlab/ui';
-import Component from 'ee/subscriptions/new/components/checkout/components/zuora.vue';
+import Component from 'ee/subscriptions/new/components/checkout/zuora.vue';
 
 describe('Zuora', () => {
   const localVue = createLocalVue();