diff options
Diffstat (limited to 'spec/frontend/deploy_freeze')
3 files changed, 11 insertions, 14 deletions
diff --git a/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js b/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js index 392652292cf..cc044800e5e 100644 --- a/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js +++ b/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js @@ -1,4 +1,5 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; +import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import Vuex from 'vuex'; import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue'; import DeployFreezeSettings from '~/deploy_freeze/components/deploy_freeze_settings.vue'; @@ -6,8 +7,7 @@ import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vu import createStore from '~/deploy_freeze/store'; import { timezoneDataFixture } from '../helpers'; -const localVue = createLocalVue(); -localVue.use(Vuex); +Vue.use(Vuex); describe('Deploy freeze settings', () => { let wrapper; @@ -20,7 +20,6 @@ describe('Deploy freeze settings', () => { }); jest.spyOn(store, 'dispatch').mockImplementation(); wrapper = shallowMount(DeployFreezeSettings, { - localVue, store, }); }); diff --git a/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js b/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js index 403d0dce3fc..137776edfab 100644 --- a/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js +++ b/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js @@ -1,13 +1,13 @@ import { GlModal } from '@gitlab/ui'; -import { createLocalVue, mount } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; +import Vue, { nextTick } from 'vue'; import Vuex from 'vuex'; import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vue'; import createStore from '~/deploy_freeze/store'; import { RECEIVE_FREEZE_PERIODS_SUCCESS } from '~/deploy_freeze/store/mutation_types'; import { freezePeriodsFixture, timezoneDataFixture } from '../helpers'; -const localVue = createLocalVue(); -localVue.use(Vuex); +Vue.use(Vuex); describe('Deploy freeze table', () => { let wrapper; @@ -21,7 +21,6 @@ describe('Deploy freeze table', () => { jest.spyOn(store, 'dispatch').mockImplementation(); wrapper = mount(DeployFreezeTable, { attachTo: document.body, - localVue, store, }); }; @@ -57,7 +56,7 @@ describe('Deploy freeze table', () => { describe('with data', () => { beforeEach(async () => { store.commit(RECEIVE_FREEZE_PERIODS_SUCCESS, freezePeriodsFixture); - await wrapper.vm.$nextTick(); + await nextTick(); }); it('displays data', () => { @@ -69,7 +68,7 @@ describe('Deploy freeze table', () => { it('allows user to edit deploy freeze', async () => { findEditDeployFreezeButton().trigger('click'); - await wrapper.vm.$nextTick(); + await nextTick(); expect(store.dispatch).toHaveBeenCalledWith( 'setFreezePeriod', diff --git a/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js b/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js index 5f4d4071f29..aea81daecef 100644 --- a/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js +++ b/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js @@ -1,12 +1,12 @@ import { GlDropdownItem, GlDropdown } from '@gitlab/ui'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; +import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import Vuex from 'vuex'; import createStore from '~/deploy_freeze/store'; import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; import { findTzByName, formatTz, timezoneDataFixture } from '../helpers'; -const localVue = createLocalVue(); -localVue.use(Vuex); +Vue.use(Vuex); describe('Deploy freeze timezone dropdown', () => { let wrapper; @@ -19,7 +19,6 @@ describe('Deploy freeze timezone dropdown', () => { }); wrapper = shallowMount(TimezoneDropdown, { store, - localVue, propsData: { value: selectedTimezone, timezoneData: timezoneDataFixture, |