diff options
author | Dennis Tang <dtang@gitlab.com> | 2018-05-09 14:52:17 +0200 |
---|---|---|
committer | Dennis Tang <dtang@gitlab.com> | 2018-05-09 14:52:17 +0200 |
commit | f86f94503b84ca89d09f5ef6cc0404af7394ff65 (patch) | |
tree | 655643a699113b4a8fd94e8c6a7171d12b76db06 /spec/javascripts/projects/gke_cluster_dropdowns | |
parent | 4f001a3abfb903e8e2045907c0f6e1f08ca5ab98 (diff) | |
download | gitlab-ce-f86f94503b84ca89d09f5ef6cc0404af7394ff65.tar.gz |
removed „fetched“ prefix from mutation and state
Diffstat (limited to 'spec/javascripts/projects/gke_cluster_dropdowns')
6 files changed, 32 insertions, 35 deletions
diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js index 471465528ec..d22c43c67e2 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown_spec.js @@ -3,8 +3,8 @@ import GkeMachineTypeDropdown from '~/projects/gke_cluster_dropdowns/components/ import { SET_PROJECT, SET_ZONE, - SET_FETCHED_ZONES, - SET_FETCHED_MACHINE_TYPES, + SET_ZONES, + SET_MACHINE_TYPES, } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; @@ -84,7 +84,7 @@ describe('GkeMachineTypeDropdown', () => { describe('form input', () => { it('reflects new value when dropdown item is clicked', done => { expect(vm.$el.querySelector('input').value).toBe(''); - vm.$store.commit(SET_FETCHED_MACHINE_TYPES, gapiMachineTypesResponseMock.items); + vm.$store.commit(SET_MACHINE_TYPES, gapiMachineTypesResponseMock.items); vm.$nextTick(() => { vm.$el.querySelector('.dropdown-content button').click(); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js index ae2fbb39375..28b1dc466f7 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import GkeProjectIdDropdown from '~/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue'; -import { SET_FETCHED_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECTS } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; @@ -64,7 +64,7 @@ describe('GkeProjectIdDropdown', () => { it('returns empty toggle text', done => { vm.$nextTick(() => { - vm.$store.commit(SET_FETCHED_PROJECTS, []); + vm.$store.commit(SET_PROJECTS, []); vm.setProject(emptyProjectMock); vm.$nextTick(() => { diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js index 0b9b7318519..cb137e33a0d 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown_spec.js @@ -1,9 +1,6 @@ import Vue from 'vue'; import GkeZoneDropdown from '~/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue'; -import { - SET_PROJECT, - SET_FETCHED_ZONES, -} from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; +import { SET_PROJECT, SET_ZONES } from '~/projects/gke_cluster_dropdowns/stores/mutation_types'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import { resetStore } from '../helpers'; @@ -67,7 +64,7 @@ describe('GkeZoneDropdown', () => { describe('selectItem', () => { it('reflects new value when dropdown item is clicked', done => { expect(vm.$el.querySelector('input').value).toBe(''); - vm.$store.commit(SET_FETCHED_ZONES, gapiZonesResponseMock.items); + vm.$store.commit(SET_ZONES, gapiZonesResponseMock.items); vm.$nextTick(() => { vm.$el.querySelector('.dropdown-content button').click(); diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js b/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js index 612bc19fce1..c34190d02f2 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/helpers.js @@ -13,9 +13,9 @@ export const resetStore = store => { }, selectedZone: '', selectedMachineType: '', - fetchedProjects: [], - fetchedZones: [], - fetchedMachineTypes: [], + projects: [], + zones: [], + machineTypes: [], }); }; diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js index 5e4ea027d7d..501113d7f33 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/actions_spec.js @@ -56,8 +56,8 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getProjects') .then(() => { - expect(store.state.fetchedProjects[0].projectId).toEqual(selectedProjectMock.projectId); - expect(store.state.fetchedProjects[0].name).toEqual(selectedProjectMock.name); + expect(store.state.projects[0].projectId).toEqual(selectedProjectMock.projectId); + expect(store.state.projects[0].name).toEqual(selectedProjectMock.name); done(); }) @@ -70,7 +70,7 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getZones') .then(() => { - expect(store.state.fetchedZones[0].name).toEqual(selectedZoneMock); + expect(store.state.zones[0].name).toEqual(selectedZoneMock); done(); }) @@ -83,7 +83,7 @@ describe('GCP Cluster Dropdown Store Actions', () => { store .dispatch('getMachineTypes') .then(() => { - expect(store.state.fetchedMachineTypes[0].name).toEqual(selectedMachineTypeMock); + expect(store.state.machineTypes[0].name).toEqual(selectedMachineTypeMock); done(); }) diff --git a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js index 0db3266349e..5569f88467f 100644 --- a/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js +++ b/spec/javascripts/projects/gke_cluster_dropdowns/stores/mutations_spec.js @@ -52,45 +52,45 @@ describe('GCP Cluster Dropdown Store Mutations', () => { }); }); - describe('SET_FETCHED_PROJECTS', () => { - it('should set Google API Projects response as fetchedProjects', () => { + describe('SET_PROJECTS', () => { + it('should set Google API Projects response as projects', () => { const state = { - fetchedProjects: [], + projects: [], }; - expect(state.fetchedProjects.length).toEqual(0); + expect(state.projects.length).toEqual(0); - mutations.SET_FETCHED_PROJECTS(state, gapiProjectsResponseMock.projects); + mutations.SET_PROJECTS(state, gapiProjectsResponseMock.projects); - expect(state.fetchedProjects.length).toEqual(gapiProjectsResponseMock.projects.length); + expect(state.projects.length).toEqual(gapiProjectsResponseMock.projects.length); }); }); - describe('SET_FETCHED_ZONES', () => { - it('should set Google API Zones response as fetchedZones', () => { + describe('SET_ZONES', () => { + it('should set Google API Zones response as zones', () => { const state = { - fetchedZones: [], + zones: [], }; - expect(state.fetchedZones.length).toEqual(0); + expect(state.zones.length).toEqual(0); - mutations.SET_FETCHED_ZONES(state, gapiZonesResponseMock.items); + mutations.SET_ZONES(state, gapiZonesResponseMock.items); - expect(state.fetchedZones.length).toEqual(gapiZonesResponseMock.items.length); + expect(state.zones.length).toEqual(gapiZonesResponseMock.items.length); }); }); - describe('SET_FETCHED_MACHINE_TYPES', () => { - it('should set Google API Machine Types response as fetchedMachineTypes', () => { + describe('SET_MACHINE_TYPES', () => { + it('should set Google API Machine Types response as machineTypes', () => { const state = { - fetchedMachineTypes: [], + machineTypes: [], }; - expect(state.fetchedMachineTypes.length).toEqual(0); + expect(state.machineTypes.length).toEqual(0); - mutations.SET_FETCHED_MACHINE_TYPES(state, gapiMachineTypesResponseMock.items); + mutations.SET_MACHINE_TYPES(state, gapiMachineTypesResponseMock.items); - expect(state.fetchedMachineTypes.length).toEqual(gapiMachineTypesResponseMock.items.length); + expect(state.machineTypes.length).toEqual(gapiMachineTypesResponseMock.items.length); }); }); }); |