From 4658cdaa181625f1040bcc92ba2705958d41a2c0 Mon Sep 17 00:00:00 2001 From: Illya Klymov <xanf@xanf.me> Date: Wed, 8 Jan 2020 17:15:34 +0200 Subject: [PATCH] Remove incorrect localVue usage localVue is required only with use method --- spec/frontend/monitoring/components/dashboard_spec.js | 6 ++---- .../monitoring/components/dashboard_time_url_spec.js | 7 ++----- .../monitoring/components/dashboard_time_window_spec.js | 7 ++----- spec/frontend/monitoring/components/graph_group_spec.js | 7 ++----- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js index 8a10857d0ff..a9a159a42b2 100644 --- a/spec/frontend/monitoring/components/dashboard_spec.js +++ b/spec/frontend/monitoring/components/dashboard_spec.js @@ -24,13 +24,12 @@ const localVue = createLocalVue(); const expectedPanelCount = 2; describe('Dashboard', () => { - let DashboardComponent; let store; let wrapper; let mock; const createShallowWrapper = (props = {}, options = {}) => { - wrapper = shallowMount(localVue.extend(DashboardComponent), { + wrapper = shallowMount(Dashboard, { localVue, sync: false, propsData: { ...propsData, ...props }, @@ -40,7 +39,7 @@ describe('Dashboard', () => { }; const createMountedWrapper = (props = {}, options = {}) => { - wrapper = mount(localVue.extend(DashboardComponent), { + wrapper = mount(Dashboard, { localVue, sync: false, propsData: { ...propsData, ...props }, @@ -51,7 +50,6 @@ describe('Dashboard', () => { beforeEach(() => { store = createStore(); - DashboardComponent = localVue.extend(Dashboard); mock = new MockAdapter(axios); }); diff --git a/spec/frontend/monitoring/components/dashboard_time_url_spec.js b/spec/frontend/monitoring/components/dashboard_time_url_spec.js index 8dc450cf131..822a28bc657 100644 --- a/spec/frontend/monitoring/components/dashboard_time_url_spec.js +++ b/spec/frontend/monitoring/components/dashboard_time_url_spec.js @@ -1,11 +1,9 @@ -import { mount, createLocalVue } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import createFlash from '~/flash'; import Dashboard from '~/monitoring/components/dashboard.vue'; import { createStore } from '~/monitoring/stores'; import { propsData } from '../init_utils'; -const localVue = createLocalVue(); - jest.mock('~/flash'); jest.mock('~/lib/utils/url_utility', () => ({ @@ -17,8 +15,7 @@ describe('dashboard invalid url parameters', () => { let wrapper; const createMountedWrapper = (props = {}, options = {}) => { - wrapper = mount(localVue.extend(Dashboard), { - localVue, + wrapper = mount(Dashboard, { sync: false, propsData: { ...propsData, ...props }, store, diff --git a/spec/frontend/monitoring/components/dashboard_time_window_spec.js b/spec/frontend/monitoring/components/dashboard_time_window_spec.js index d49af6f84cb..658d3b68a76 100644 --- a/spec/frontend/monitoring/components/dashboard_time_window_spec.js +++ b/spec/frontend/monitoring/components/dashboard_time_window_spec.js @@ -1,4 +1,4 @@ -import { mount, createLocalVue } from '@vue/test-utils'; +import { mount } from '@vue/test-utils'; import { GlDropdownItem } from '@gitlab/ui'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; @@ -8,8 +8,6 @@ import { createStore } from '~/monitoring/stores'; import { propsData, setupComponentStore } from '../init_utils'; import { metricsGroupsAPIResponse, mockApiEndpoint } from '../mock_data'; -const localVue = createLocalVue(); - jest.mock('~/lib/utils/url_utility', () => ({ getParameterValues: jest.fn().mockImplementation(param => { if (param === 'start') return ['2019-10-01T18:27:47.000Z']; @@ -25,8 +23,7 @@ describe('dashboard time window', () => { let mock; const createComponentWrapperMounted = (props = {}, options = {}) => { - wrapper = mount(localVue.extend(Dashboard), { - localVue, + wrapper = mount(Dashboard, { sync: false, propsData: { ...propsData, ...props }, store, diff --git a/spec/frontend/monitoring/components/graph_group_spec.js b/spec/frontend/monitoring/components/graph_group_spec.js index 43ca17c3cbc..edd08cdb4c9 100644 --- a/spec/frontend/monitoring/components/graph_group_spec.js +++ b/spec/frontend/monitoring/components/graph_group_spec.js @@ -1,9 +1,7 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; +import { shallowMount } from '@vue/test-utils'; import GraphGroup from '~/monitoring/components/graph_group.vue'; import Icon from '~/vue_shared/components/icon.vue'; -const localVue = createLocalVue(); - describe('Graph group component', () => { let wrapper; @@ -12,10 +10,9 @@ describe('Graph group component', () => { const findCaretIcon = () => wrapper.find(Icon); const createComponent = propsData => { - wrapper = shallowMount(localVue.extend(GraphGroup), { + wrapper = shallowMount(GraphGroup, { propsData, sync: false, - localVue, }); }; -- 2.30.9