diff options
Diffstat (limited to 'spec/frontend/clusters/components')
11 files changed, 50 insertions, 50 deletions
diff --git a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap index ee4ec4636ea..6047b404197 100644 --- a/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap +++ b/spec/frontend/clusters/components/__snapshots__/remove_cluster_confirmation_spec.js.snap @@ -60,8 +60,8 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ > <svg aria-hidden="true" - class="gl-icon s16 gl-new-dropdown-item-check-icon" - data-testid="mobile-issue-close-icon" + class="gl-icon s16 gl-new-dropdown-item-check-icon gl-mt-3 gl-align-self-start" + data-testid="dropdown-item-checkbox" > <use href="#mobile-issue-close" @@ -115,8 +115,8 @@ exports[`Remove cluster confirmation modal renders splitbutton with modal includ > <svg aria-hidden="true" - class="gl-icon s16 gl-new-dropdown-item-check-icon gl-visibility-hidden" - data-testid="mobile-issue-close-icon" + class="gl-icon s16 gl-new-dropdown-item-check-icon gl-visibility-hidden gl-mt-3 gl-align-self-start" + data-testid="dropdown-item-checkbox" > <use href="#mobile-issue-close" diff --git a/spec/frontend/clusters/components/application_row_spec.js b/spec/frontend/clusters/components/application_row_spec.js index 49a299cfb3c..eff3493d7bd 100644 --- a/spec/frontend/clusters/components/application_row_spec.js +++ b/spec/frontend/clusters/components/application_row_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; -import eventHub from '~/clusters/event_hub'; -import { APPLICATION_STATUS, ELASTIC_STACK } from '~/clusters/constants'; +import { shallowMount } from '@vue/test-utils'; import ApplicationRow from '~/clusters/components/application_row.vue'; import UninstallApplicationConfirmationModal from '~/clusters/components/uninstall_application_confirmation_modal.vue'; import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue'; +import { APPLICATION_STATUS, ELASTIC_STACK } from '~/clusters/constants'; +import eventHub from '~/clusters/event_hub'; import { DEFAULT_APPLICATION_STATE } from '../services/mock_data'; diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js index cf89246c1a5..db5915cb1eb 100644 --- a/spec/frontend/clusters/components/applications_spec.js +++ b/spec/frontend/clusters/components/applications_spec.js @@ -1,13 +1,13 @@ import { shallowMount, mount } from '@vue/test-utils'; -import Applications from '~/clusters/components/applications.vue'; -import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants'; -import { APPLICATIONS_MOCK_STATE } from '../services/mock_data'; -import eventHub from '~/clusters/event_hub'; import ApplicationRow from '~/clusters/components/application_row.vue'; -import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; +import Applications from '~/clusters/components/applications.vue'; import CrossplaneProviderStack from '~/clusters/components/crossplane_provider_stack.vue'; -import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue'; +import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; +import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; +import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants'; +import eventHub from '~/clusters/event_hub'; +import { APPLICATIONS_MOCK_STATE } from '../services/mock_data'; describe('Applications', () => { let wrapper; @@ -16,7 +16,7 @@ describe('Applications', () => { gon.features = gon.features || {}; }); - const createApp = ({ applications, type, propsData } = {}, isShallow) => { + const createComponent = ({ applications, type, propsData } = {}, isShallow) => { const mountMethod = isShallow ? shallowMount : mount; wrapper = mountMethod(Applications, { @@ -29,7 +29,7 @@ describe('Applications', () => { }); }; - const createShallowApp = (options) => createApp(options, true); + const createShallowComponent = (options) => createComponent(options, true); const findByTestId = (id) => wrapper.find(`[data-testid="${id}"]`); afterEach(() => { wrapper.destroy(); @@ -37,7 +37,7 @@ describe('Applications', () => { describe('Project cluster applications', () => { beforeEach(() => { - createApp({ type: CLUSTER_TYPE.PROJECT }); + createComponent({ type: CLUSTER_TYPE.PROJECT }); }); it('renders a row for Ingress', () => { @@ -82,7 +82,7 @@ describe('Applications', () => { describe('Group cluster applications', () => { beforeEach(() => { - createApp({ type: CLUSTER_TYPE.GROUP }); + createComponent({ type: CLUSTER_TYPE.GROUP }); }); it('renders a row for Ingress', () => { @@ -128,7 +128,7 @@ describe('Applications', () => { describe('Instance cluster applications', () => { beforeEach(() => { - createApp({ type: CLUSTER_TYPE.INSTANCE }); + createComponent({ type: CLUSTER_TYPE.INSTANCE }); }); it('renders a row for Ingress', () => { @@ -174,14 +174,14 @@ describe('Applications', () => { describe('Helm application', () => { it('does not render a row for Helm Tiller', () => { - createApp(); + createComponent(); expect(wrapper.find('.js-cluster-application-row-helm').exists()).toBe(false); }); }); describe('Ingress application', () => { it('shows the correct warning message', () => { - createApp(); + createComponent(); expect(findByTestId('ingressCostWarning').element).toMatchSnapshot(); }); @@ -195,7 +195,7 @@ describe('Applications', () => { }, }; - beforeEach(() => createShallowApp(propsData)); + beforeEach(() => createShallowComponent(propsData)); it('renders IngressModsecuritySettings', () => { const modsecuritySettings = wrapper.find(IngressModsecuritySettings); @@ -206,7 +206,7 @@ describe('Applications', () => { describe('when installed', () => { describe('with ip address', () => { it('renders ip address with a clipboard button', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', @@ -225,7 +225,7 @@ describe('Applications', () => { describe('with hostname', () => { it('renders hostname with a clipboard button', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', @@ -255,7 +255,7 @@ describe('Applications', () => { describe('without ip address', () => { it('renders an input text with a loading icon and an alert text', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', @@ -272,7 +272,7 @@ describe('Applications', () => { describe('before installing', () => { it('does not render the IP address', () => { - createApp(); + createComponent(); expect(wrapper.text()).not.toContain('Ingress IP Address'); expect(wrapper.find('.js-endpoint').exists()).toBe(false); @@ -282,13 +282,13 @@ describe('Applications', () => { describe('Cert-Manager application', () => { it('shows the correct description', () => { - createApp(); + createComponent(); expect(findByTestId('certManagerDescription').element).toMatchSnapshot(); }); describe('when not installed', () => { it('renders email & allows editing', () => { - createApp({ + createComponent({ applications: { cert_manager: { title: 'Cert-Manager', @@ -305,7 +305,7 @@ describe('Applications', () => { describe('when installed', () => { it('renders email in readonly', () => { - createApp({ + createComponent({ applications: { cert_manager: { title: 'Cert-Manager', @@ -324,7 +324,7 @@ describe('Applications', () => { describe('Jupyter application', () => { describe('with ingress installed with ip & jupyter installable', () => { it('renders hostname active input', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', @@ -342,7 +342,7 @@ describe('Applications', () => { describe('with ingress installed without external ip', () => { it('does not render hostname input', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', status: 'installed' }, }, @@ -356,7 +356,7 @@ describe('Applications', () => { describe('with ingress & jupyter installed', () => { it('renders readonly input', () => { - createApp({ + createComponent({ applications: { ingress: { title: 'Ingress', @@ -375,7 +375,7 @@ describe('Applications', () => { describe('without ingress installed', () => { beforeEach(() => { - createApp(); + createComponent(); }); it('does not render input', () => { @@ -388,7 +388,7 @@ describe('Applications', () => { describe('Prometheus application', () => { it('shows the correct description', () => { - createApp(); + createComponent(); expect(findByTestId('prometheusDescription').element).toMatchSnapshot(); }); }); @@ -414,14 +414,14 @@ describe('Applications', () => { let knativeDomainEditor; beforeEach(() => { - createShallowApp(propsData); + createShallowComponent(propsData); jest.spyOn(eventHub, '$emit'); knativeDomainEditor = wrapper.find(KnativeDomainEditor); }); it('shows the correct description', async () => { - createApp(); + createComponent(); wrapper.setProps({ providerType: PROVIDER_TYPE.GCP, preInstalledKnative: true, @@ -487,7 +487,7 @@ describe('Applications', () => { }, }; - beforeEach(() => createShallowApp(propsData)); + beforeEach(() => createShallowComponent(propsData)); it('renders the correct Component', () => { const crossplane = wrapper.find(CrossplaneProviderStack); @@ -495,7 +495,7 @@ describe('Applications', () => { }); it('shows the correct description', () => { - createApp(); + createComponent(); expect(findByTestId('crossplaneDescription').element).toMatchSnapshot(); }); }); @@ -503,7 +503,7 @@ describe('Applications', () => { describe('Elastic Stack application', () => { describe('with elastic stack installable', () => { it('renders the install button enabled', () => { - createApp(); + createComponent(); expect( wrapper @@ -517,7 +517,7 @@ describe('Applications', () => { describe('elastic stack installed', () => { it('renders uninstall button', () => { - createApp({ + createComponent({ applications: { elastic_stack: { title: 'Elastic Stack', status: 'installed' }, }, @@ -535,7 +535,7 @@ describe('Applications', () => { }); describe('Fluentd application', () => { - beforeEach(() => createShallowApp()); + beforeEach(() => createShallowComponent()); it('renders the correct Component', () => { expect(wrapper.find(FluentdOutputSettings).exists()).toBe(true); @@ -544,7 +544,7 @@ describe('Applications', () => { describe('Cilium application', () => { it('shows the correct description', () => { - createApp({ propsData: { ciliumHelpPath: 'cilium-help-path' } }); + createComponent({ propsData: { ciliumHelpPath: 'cilium-help-path' } }); expect(findByTestId('ciliumDescription').element).toMatchSnapshot(); }); }); diff --git a/spec/frontend/clusters/components/fluentd_output_settings_spec.js b/spec/frontend/clusters/components/fluentd_output_settings_spec.js index cd996ae915b..2c6e5bbd46a 100644 --- a/spec/frontend/clusters/components/fluentd_output_settings_spec.js +++ b/spec/frontend/clusters/components/fluentd_output_settings_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlDropdown, GlFormCheckbox } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue'; import { APPLICATION_STATUS, FLUENTD } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; diff --git a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js b/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js index 1f07a0b7908..fd6d9854868 100644 --- a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js +++ b/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlToggle, GlDropdown } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; import { APPLICATION_STATUS, INGRESS } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; diff --git a/spec/frontend/clusters/components/knative_domain_editor_spec.js b/spec/frontend/clusters/components/knative_domain_editor_spec.js index b7f76211fd6..207eb071171 100644 --- a/spec/frontend/clusters/components/knative_domain_editor_spec.js +++ b/spec/frontend/clusters/components/knative_domain_editor_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; import { APPLICATION_STATUS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/new_cluster_spec.js b/spec/frontend/clusters/components/new_cluster_spec.js index bb4898f98ba..e4bca5eaaa5 100644 --- a/spec/frontend/clusters/components/new_cluster_spec.js +++ b/spec/frontend/clusters/components/new_cluster_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import NewCluster from '~/clusters/components/new_cluster.vue'; import createClusterStore from '~/clusters/stores/new_cluster'; diff --git a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js index f448948843a..e2726b93ea5 100644 --- a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js +++ b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; -import SplitButton from '~/vue_shared/components/split_button.vue'; +import { mount } from '@vue/test-utils'; import RemoveClusterConfirmation from '~/clusters/components/remove_cluster_confirmation.vue'; +import SplitButton from '~/vue_shared/components/split_button.vue'; describe('Remove cluster confirmation modal', () => { let wrapper; diff --git a/spec/frontend/clusters/components/uninstall_application_button_spec.js b/spec/frontend/clusters/components/uninstall_application_button_spec.js index c106292965e..2596820e5ac 100644 --- a/spec/frontend/clusters/components/uninstall_application_button_spec.js +++ b/spec/frontend/clusters/components/uninstall_application_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UninstallApplicationButton from '~/clusters/components/uninstall_application_button.vue'; import { APPLICATION_STATUS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js b/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js index c07f6851826..74ae4ecc486 100644 --- a/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js +++ b/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UninstallApplicationConfirmationModal from '~/clusters/components/uninstall_application_confirmation_modal.vue'; import { INGRESS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js index dd3aaf6f946..e933f17a980 100644 --- a/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js +++ b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue'; import { ELASTIC_STACK } from '~/clusters/constants'; |