diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/frontend/create_cluster | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/frontend/create_cluster')
8 files changed, 51 insertions, 95 deletions
diff --git a/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js b/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js index 14f2a527dfb..17abf409717 100644 --- a/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js +++ b/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js @@ -92,7 +92,7 @@ describe('ClusterFormDropdown', () => { }); it('displays a checked GlIcon next to the item', () => { - expect(wrapper.find(GlIcon).is('.invisible')).toBe(false); + expect(wrapper.find(GlIcon).classes()).not.toContain('invisible'); expect(wrapper.find(GlIcon).props('name')).toBe('mobile-issue-close'); }); }); diff --git a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js index 34d9ee733c4..d7dd7072f67 100644 --- a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js @@ -147,6 +147,7 @@ describe('EksClusterConfigurationForm', () => { initialState: { clusterName: 'cluster name', environmentScope: '*', + kubernetesVersion: '1.16', selectedRegion: 'region', selectedRole: 'role', selectedKeyPair: 'key pair', @@ -400,43 +401,33 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setRegion action', () => { - expect(actions.setRegion).toHaveBeenCalledWith(expect.anything(), { region }, undefined); + expect(actions.setRegion).toHaveBeenCalledWith(expect.anything(), { region }); }); it('fetches available vpcs', () => { - expect(vpcsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region }, undefined); + expect(vpcsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region }); }); it('fetches available key pairs', () => { - expect(keyPairsActions.fetchItems).toHaveBeenCalledWith( - expect.anything(), - { region }, - undefined, - ); + expect(keyPairsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { region }); }); it('cleans selected vpc', () => { - expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc: null }, undefined); + expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc: null }); }); it('cleans selected key pair', () => { - expect(actions.setKeyPair).toHaveBeenCalledWith( - expect.anything(), - { keyPair: null }, - undefined, - ); + expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair: null }); }); it('cleans selected subnet', () => { - expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }, undefined); + expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }); }); it('cleans selected security group', () => { - expect(actions.setSecurityGroup).toHaveBeenCalledWith( - expect.anything(), - { securityGroup: null }, - undefined, - ); + expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), { + securityGroup: null, + }); }); }); @@ -445,11 +436,7 @@ describe('EksClusterConfigurationForm', () => { findClusterNameInput().vm.$emit('input', clusterName); - expect(actions.setClusterName).toHaveBeenCalledWith( - expect.anything(), - { clusterName }, - undefined, - ); + expect(actions.setClusterName).toHaveBeenCalledWith(expect.anything(), { clusterName }); }); it('dispatches setEnvironmentScope when environment scope input changes', () => { @@ -457,11 +444,9 @@ describe('EksClusterConfigurationForm', () => { findEnvironmentScopeInput().vm.$emit('input', environmentScope); - expect(actions.setEnvironmentScope).toHaveBeenCalledWith( - expect.anything(), - { environmentScope }, - undefined, - ); + expect(actions.setEnvironmentScope).toHaveBeenCalledWith(expect.anything(), { + environmentScope, + }); }); it('dispatches setKubernetesVersion when kubernetes version dropdown changes', () => { @@ -469,11 +454,9 @@ describe('EksClusterConfigurationForm', () => { findKubernetesVersionDropdown().vm.$emit('input', kubernetesVersion); - expect(actions.setKubernetesVersion).toHaveBeenCalledWith( - expect.anything(), - { kubernetesVersion }, - undefined, - ); + expect(actions.setKubernetesVersion).toHaveBeenCalledWith(expect.anything(), { + kubernetesVersion, + }); }); it('dispatches setGitlabManagedCluster when gitlab managed cluster input changes', () => { @@ -481,11 +464,9 @@ describe('EksClusterConfigurationForm', () => { findGitlabManagedClusterCheckbox().vm.$emit('input', gitlabManagedCluster); - expect(actions.setGitlabManagedCluster).toHaveBeenCalledWith( - expect.anything(), - { gitlabManagedCluster }, - undefined, - ); + expect(actions.setGitlabManagedCluster).toHaveBeenCalledWith(expect.anything(), { + gitlabManagedCluster, + }); }); describe('when vpc is selected', () => { @@ -498,35 +479,28 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setVpc action', () => { - expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc }, undefined); + expect(actions.setVpc).toHaveBeenCalledWith(expect.anything(), { vpc }); }); it('cleans selected subnet', () => { - expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }, undefined); + expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet: [] }); }); it('cleans selected security group', () => { - expect(actions.setSecurityGroup).toHaveBeenCalledWith( - expect.anything(), - { securityGroup: null }, - undefined, - ); + expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), { + securityGroup: null, + }); }); it('dispatches fetchSubnets action', () => { - expect(subnetsActions.fetchItems).toHaveBeenCalledWith( - expect.anything(), - { vpc, region }, - undefined, - ); + expect(subnetsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { vpc, region }); }); it('dispatches fetchSecurityGroups action', () => { - expect(securityGroupsActions.fetchItems).toHaveBeenCalledWith( - expect.anything(), - { vpc, region }, - undefined, - ); + expect(securityGroupsActions.fetchItems).toHaveBeenCalledWith(expect.anything(), { + vpc, + region, + }); }); }); @@ -538,7 +512,7 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setSubnet action', () => { - expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet }, undefined); + expect(actions.setSubnet).toHaveBeenCalledWith(expect.anything(), { subnet }); }); }); @@ -550,7 +524,7 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setRole action', () => { - expect(actions.setRole).toHaveBeenCalledWith(expect.anything(), { role }, undefined); + expect(actions.setRole).toHaveBeenCalledWith(expect.anything(), { role }); }); }); @@ -562,7 +536,7 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setKeyPair action', () => { - expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair }, undefined); + expect(actions.setKeyPair).toHaveBeenCalledWith(expect.anything(), { keyPair }); }); }); @@ -574,11 +548,7 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setSecurityGroup action', () => { - expect(actions.setSecurityGroup).toHaveBeenCalledWith( - expect.anything(), - { securityGroup }, - undefined, - ); + expect(actions.setSecurityGroup).toHaveBeenCalledWith(expect.anything(), { securityGroup }); }); }); @@ -590,11 +560,7 @@ describe('EksClusterConfigurationForm', () => { }); it('dispatches setInstanceType action', () => { - expect(actions.setInstanceType).toHaveBeenCalledWith( - expect.anything(), - { instanceType }, - undefined, - ); + expect(actions.setInstanceType).toHaveBeenCalledWith(expect.anything(), { instanceType }); }); }); @@ -603,7 +569,7 @@ describe('EksClusterConfigurationForm', () => { findNodeCountInput().vm.$emit('input', nodeCount); - expect(actions.setNodeCount).toHaveBeenCalledWith(expect.anything(), { nodeCount }, undefined); + expect(actions.setNodeCount).toHaveBeenCalledWith(expect.anything(), { nodeCount }); }); describe('when all cluster configuration fields are set', () => { diff --git a/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js b/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js index c58638f5c80..d2d6db31d1b 100644 --- a/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js @@ -1,9 +1,7 @@ import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; - +import { GlButton } from '@gitlab/ui'; import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue'; -import LoadingButton from '~/vue_shared/components/loading_button.vue'; - import eksClusterState from '~/create_cluster/eks_cluster/store/state'; const localVue = createLocalVue(); @@ -46,7 +44,7 @@ describe('ServiceCredentialsForm', () => { const findExternalIdInput = () => vm.find('#eks-external-id'); const findCopyExternalIdButton = () => vm.find('.js-copy-external-id-button'); const findInvalidCredentials = () => vm.find('.js-invalid-credentials'); - const findSubmitButton = () => vm.find(LoadingButton); + const findSubmitButton = () => vm.find(GlButton); it('displays provided account id', () => { expect(findAccountIdInput().attributes('value')).toBe(accountId); @@ -102,7 +100,7 @@ describe('ServiceCredentialsForm', () => { }); it('displays Authenticating label on submit button', () => { - expect(findSubmitButton().props('label')).toBe('Authenticating'); + expect(findSubmitButton().text()).toBe('Authenticating'); }); }); diff --git a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js index 882a4a002bd..ed753888790 100644 --- a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js @@ -47,7 +47,7 @@ describe('EKS Cluster Store Actions', () => { beforeEach(() => { clusterName = 'my cluster'; environmentScope = 'production'; - kubernetesVersion = '11.1'; + kubernetesVersion = '1.16'; region = 'regions-1'; vpc = 'vpc-1'; subnet = 'subnet-1'; @@ -180,6 +180,7 @@ describe('EKS Cluster Store Actions', () => { environment_scope: environmentScope, managed: gitlabManagedCluster, provider_aws_attributes: { + kubernetes_version: kubernetesVersion, region, vpc_id: vpc, subnet_ids: subnet, diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js index 57ef74f0119..c09eaa63d4d 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js @@ -124,11 +124,7 @@ describe('GkeMachineTypeDropdown', () => { wrapper.find('.dropdown-content button').trigger('click'); return wrapper.vm.$nextTick().then(() => { - expect(setMachineType).toHaveBeenCalledWith( - expect.anything(), - selectedMachineTypeMock, - undefined, - ); + expect(setMachineType).toHaveBeenCalledWith(expect.anything(), selectedMachineTypeMock); }); }); }); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js index 1df583af711..ce24d186511 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js @@ -121,23 +121,19 @@ describe('GkeNetworkDropdown', () => { }); it('cleans selected subnetwork', () => { - expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), '', undefined); + expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), ''); }); it('dispatches the setNetwork action', () => { - expect(setNetwork).toHaveBeenCalledWith(expect.anything(), selectedNetwork, undefined); + expect(setNetwork).toHaveBeenCalledWith(expect.anything(), selectedNetwork); }); it('fetches subnetworks for the selected project, region, and network', () => { - expect(fetchSubnetworks).toHaveBeenCalledWith( - expect.anything(), - { - project: projectId, - region, - network: selectedNetwork.selfLink, - }, - undefined, - ); + expect(fetchSubnetworks).toHaveBeenCalledWith(expect.anything(), { + project: projectId, + region, + network: selectedNetwork.selfLink, + }); }); }); }); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js index 0d429778a44..eb58108bf3c 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js @@ -130,7 +130,6 @@ describe('GkeProjectIdDropdown', () => { expect(setProject).toHaveBeenCalledWith( expect.anything(), gapiProjectsResponseMock.projects[0], - undefined, ); }); }); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js index a1dc3960fe9..35e43d5b033 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js @@ -107,7 +107,7 @@ describe('GkeSubnetworkDropdown', () => { wrapper.find(ClusterFormDropdown).vm.$emit('input', selectedSubnetwork); - expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), selectedSubnetwork, undefined); + expect(setSubnetwork).toHaveBeenCalledWith(expect.anything(), selectedSubnetwork); }); }); }); |