Commit 0570d6f3 authored by Stanislav Lashmanov's avatar Stanislav Lashmanov

Remove localVue usage from non-EE tests without VueApollo

Epic: https://gitlab.com/gitlab-org/gitlab/-/issues/220482
parent 6d0438a4
import { GlModal, GlSearchBoxByType } from '@gitlab/ui'; import { GlModal, GlSearchBoxByType } 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 Vuex from 'vuex';
import getDiffWithCommit from 'test_fixtures/merge_request_diffs/with_commit.json'; import getDiffWithCommit from 'test_fixtures/merge_request_diffs/with_commit.json';
import AddReviewItemsModal from '~/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue'; import AddReviewItemsModal from '~/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue';
...@@ -8,8 +9,7 @@ import * as actions from '~/add_context_commits_modal/store/actions'; ...@@ -8,8 +9,7 @@ import * as actions from '~/add_context_commits_modal/store/actions';
import mutations from '~/add_context_commits_modal/store/mutations'; import mutations from '~/add_context_commits_modal/store/mutations';
import defaultState from '~/add_context_commits_modal/store/state'; import defaultState from '~/add_context_commits_modal/store/state';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('AddContextCommitsModal', () => { describe('AddContextCommitsModal', () => {
let wrapper; let wrapper;
...@@ -36,7 +36,6 @@ describe('AddContextCommitsModal', () => { ...@@ -36,7 +36,6 @@ describe('AddContextCommitsModal', () => {
}); });
wrapper = shallowMount(AddReviewItemsModal, { wrapper = shallowMount(AddReviewItemsModal, {
localVue,
store, store,
propsData: { propsData: {
contextCommitsPath: '', contextCommitsPath: '',
......
import { GlModal } from '@gitlab/ui'; import { GlModal } 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 Vuex from 'vuex';
import BadgeList from '~/badges/components/badge_list.vue'; import BadgeList from '~/badges/components/badge_list.vue';
import BadgeListRow from '~/badges/components/badge_list_row.vue'; import BadgeListRow from '~/badges/components/badge_list_row.vue';
...@@ -7,8 +8,7 @@ import BadgeSettings from '~/badges/components/badge_settings.vue'; ...@@ -7,8 +8,7 @@ import BadgeSettings from '~/badges/components/badge_settings.vue';
import store from '~/badges/store'; import store from '~/badges/store';
import { createDummyBadge } from '../dummy_badge'; import { createDummyBadge } from '../dummy_badge';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('BadgeSettings component', () => { describe('BadgeSettings component', () => {
let wrapper; let wrapper;
...@@ -21,7 +21,6 @@ describe('BadgeSettings component', () => { ...@@ -21,7 +21,6 @@ describe('BadgeSettings component', () => {
wrapper = shallowMount(BadgeSettings, { wrapper = shallowMount(BadgeSettings, {
store, store,
localVue,
stubs: { stubs: {
'badge-list': BadgeList, 'badge-list': BadgeList,
'badge-list-row': BadgeListRow, 'badge-list-row': BadgeListRow,
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue'; import DiffFileDrafts from '~/batch_comments/components/diff_file_drafts.vue';
import DraftNote from '~/batch_comments/components/draft_note.vue'; import DraftNote from '~/batch_comments/components/draft_note.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Batch comments diff file drafts component', () => { describe('Batch comments diff file drafts component', () => {
let vm; let vm;
...@@ -22,9 +21,8 @@ describe('Batch comments diff file drafts component', () => { ...@@ -22,9 +21,8 @@ describe('Batch comments diff file drafts component', () => {
}, },
}); });
vm = shallowMount(localVue.extend(DiffFileDrafts), { vm = shallowMount(DiffFileDrafts, {
store, store,
localVue,
propsData: { fileHash: 'filehash' }, propsData: { fileHash: 'filehash' },
}); });
} }
......
import { getByRole } from '@testing-library/dom'; import { getByRole } from '@testing-library/dom';
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { stubComponent } from 'helpers/stub_component'; import { stubComponent } from 'helpers/stub_component';
import DraftNote from '~/batch_comments/components/draft_note.vue'; import DraftNote from '~/batch_comments/components/draft_note.vue';
import { createStore } from '~/batch_comments/stores'; import { createStore } from '~/batch_comments/stores';
...@@ -7,8 +7,6 @@ import NoteableNote from '~/notes/components/noteable_note.vue'; ...@@ -7,8 +7,6 @@ import NoteableNote from '~/notes/components/noteable_note.vue';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { createDraft } from '../mock_data'; import { createDraft } from '../mock_data';
const localVue = createLocalVue();
const NoteableNoteStub = stubComponent(NoteableNote, { const NoteableNoteStub = stubComponent(NoteableNote, {
template: ` template: `
<div> <div>
...@@ -31,10 +29,9 @@ describe('Batch comments draft note component', () => { ...@@ -31,10 +29,9 @@ describe('Batch comments draft note component', () => {
const getList = () => getByRole(wrapper.element, 'list'); const getList = () => getByRole(wrapper.element, 'list');
const createComponent = (propsData = { draft }) => { const createComponent = (propsData = { draft }) => {
wrapper = shallowMount(localVue.extend(DraftNote), { wrapper = shallowMount(DraftNote, {
store, store,
propsData, propsData,
localVue,
stubs: { stubs: {
NoteableNote: NoteableNoteStub, NoteableNote: NoteableNoteStub,
}, },
......
import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem } 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 Vuex from 'vuex';
import PreviewDropdown from '~/batch_comments/components/preview_dropdown.vue'; import PreviewDropdown from '~/batch_comments/components/preview_dropdown.vue';
import { createStore } from '~/mr_notes/stores'; import { createStore } from '~/mr_notes/stores';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { createDraft } from '../mock_data'; import { createDraft } from '../mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Batch comments publish dropdown component', () => { describe('Batch comments publish dropdown component', () => {
let wrapper; let wrapper;
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import BoardNewIssue from '~/boards/components/board_new_issue.vue'; import BoardNewIssue from '~/boards/components/board_new_issue.vue';
import BoardNewItem from '~/boards/components/board_new_item.vue'; import BoardNewItem from '~/boards/components/board_new_item.vue';
...@@ -7,9 +8,7 @@ import eventHub from '~/boards/eventhub'; ...@@ -7,9 +8,7 @@ import eventHub from '~/boards/eventhub';
import { mockList, mockGroupProjects } from '../mock_data'; import { mockList, mockGroupProjects } from '../mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const addListNewIssuesSpy = jest.fn().mockResolvedValue(); const addListNewIssuesSpy = jest.fn().mockResolvedValue();
const mockActions = { addListNewIssue: addListNewIssuesSpy }; const mockActions = { addListNewIssue: addListNewIssuesSpy };
...@@ -20,7 +19,6 @@ const createComponent = ({ ...@@ -20,7 +19,6 @@ const createComponent = ({
getters = { isGroupBoard: () => true, isProjectBoard: () => false }, getters = { isGroupBoard: () => true, isProjectBoard: () => false },
} = {}) => } = {}) =>
shallowMount(BoardNewIssue, { shallowMount(BoardNewIssue, {
localVue,
store: new Vuex.Store({ store: new Vuex.Store({
state, state,
actions, actions,
......
import { GlDropdown, GlDropdownItem, GlIcon } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem, GlIcon } from '@gitlab/ui';
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import CiEnvironmentsDropdown from '~/ci_variable_list/components/ci_environments_dropdown.vue'; import CiEnvironmentsDropdown from '~/ci_variable_list/components/ci_environments_dropdown.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Ci environments dropdown', () => { describe('Ci environments dropdown', () => {
let wrapper; let wrapper;
...@@ -22,7 +22,6 @@ describe('Ci environments dropdown', () => { ...@@ -22,7 +22,6 @@ describe('Ci environments dropdown', () => {
wrapper = mount(CiEnvironmentsDropdown, { wrapper = mount(CiEnvironmentsDropdown, {
store, store,
localVue,
propsData: { propsData: {
value: term, value: term,
}, },
......
import { GlButton, GlFormInput } from '@gitlab/ui'; import { GlButton, GlFormInput } from '@gitlab/ui';
import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import { mockTracking } from 'helpers/tracking_helper'; import { mockTracking } from 'helpers/tracking_helper';
import CiEnvironmentsDropdown from '~/ci_variable_list/components/ci_environments_dropdown.vue'; import CiEnvironmentsDropdown from '~/ci_variable_list/components/ci_environments_dropdown.vue';
...@@ -9,8 +10,7 @@ import createStore from '~/ci_variable_list/store'; ...@@ -9,8 +10,7 @@ import createStore from '~/ci_variable_list/store';
import mockData from '../services/mock_data'; import mockData from '../services/mock_data';
import ModalStub from '../stubs'; import ModalStub from '../stubs';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Ci variable modal', () => { describe('Ci variable modal', () => {
let wrapper; let wrapper;
...@@ -26,7 +26,6 @@ describe('Ci variable modal', () => { ...@@ -26,7 +26,6 @@ describe('Ci variable modal', () => {
stubs: { stubs: {
GlModal: ModalStub, GlModal: ModalStub,
}, },
localVue,
store, store,
...options, ...options,
}); });
......
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import CiVariableSettings from '~/ci_variable_list/components/ci_variable_settings.vue'; import CiVariableSettings from '~/ci_variable_list/components/ci_variable_settings.vue';
import createStore from '~/ci_variable_list/store'; import createStore from '~/ci_variable_list/store';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Ci variable table', () => { describe('Ci variable table', () => {
let wrapper; let wrapper;
...@@ -16,7 +16,6 @@ describe('Ci variable table', () => { ...@@ -16,7 +16,6 @@ describe('Ci variable table', () => {
store.state.isGroup = groupState; store.state.isGroup = groupState;
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = shallowMount(CiVariableSettings, { wrapper = shallowMount(CiVariableSettings, {
localVue,
store, store,
}); });
}; };
......
import { createLocalVue, mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import CiVariableTable from '~/ci_variable_list/components/ci_variable_table.vue'; import CiVariableTable from '~/ci_variable_list/components/ci_variable_table.vue';
import createStore from '~/ci_variable_list/store'; import createStore from '~/ci_variable_list/store';
import mockData from '../services/mock_data'; import mockData from '../services/mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Ci variable table', () => { describe('Ci variable table', () => {
let wrapper; let wrapper;
...@@ -16,7 +16,6 @@ describe('Ci variable table', () => { ...@@ -16,7 +16,6 @@ describe('Ci variable table', () => {
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = mount(CiVariableTable, { wrapper = mount(CiVariableTable, {
attachTo: document.body, attachTo: document.body,
localVue,
store, store,
}); });
}; };
......
import { GlToggle, GlButton } from '@gitlab/ui'; import { GlToggle, GlButton } 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 Vuex from 'vuex';
import IntegrationForm from '~/clusters/forms/components/integration_form.vue'; import IntegrationForm from '~/clusters/forms/components/integration_form.vue';
import { createStore } from '~/clusters/forms/stores/index'; import { createStore } from '~/clusters/forms/stores/index';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('ClusterIntegrationForm', () => { describe('ClusterIntegrationForm', () => {
let wrapper; let wrapper;
...@@ -19,7 +19,6 @@ describe('ClusterIntegrationForm', () => { ...@@ -19,7 +19,6 @@ describe('ClusterIntegrationForm', () => {
const createWrapper = (storeValues = defaultStoreValues) => { const createWrapper = (storeValues = defaultStoreValues) => {
wrapper = shallowMount(IntegrationForm, { wrapper = shallowMount(IntegrationForm, {
localVue,
store: createStore(storeValues), store: createStore(storeValues),
provide: { provide: {
autoDevopsHelpPath: 'topics/autodevops/index', autoDevopsHelpPath: 'topics/autodevops/index',
......
import { GlCard, GlLoadingIcon, GlButton, GlSprintf, GlBadge } from '@gitlab/ui'; import { GlCard, GlLoadingIcon, GlButton, GlSprintf, GlBadge } from '@gitlab/ui';
import { createLocalVue } from '@vue/test-utils'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import ClustersViewAll from '~/clusters_list/components/clusters_view_all.vue'; import ClustersViewAll from '~/clusters_list/components/clusters_view_all.vue';
...@@ -16,8 +16,7 @@ import { ...@@ -16,8 +16,7 @@ import {
} from '~/clusters_list/constants'; } from '~/clusters_list/constants';
import { sprintf } from '~/locale'; import { sprintf } from '~/locale';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const addClusterPath = '/path/to/add/cluster'; const addClusterPath = '/path/to/add/cluster';
const defaultBranchName = 'default-branch'; const defaultBranchName = 'default-branch';
...@@ -59,7 +58,6 @@ describe('ClustersViewAllComponent', () => { ...@@ -59,7 +58,6 @@ describe('ClustersViewAllComponent', () => {
const createWrapper = ({ initialState }) => { const createWrapper = ({ initialState }) => {
wrapper = shallowMountExtended(ClustersViewAll, { wrapper = shallowMountExtended(ClustersViewAll, {
localVue,
store: createStore(initialState), store: createStore(initialState),
propsData, propsData,
provide: provideData, provide: provideData,
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import App from '~/code_navigation/components/app.vue'; import App from '~/code_navigation/components/app.vue';
import Popover from '~/code_navigation/components/popover.vue'; import Popover from '~/code_navigation/components/popover.vue';
import createState from '~/code_navigation/store/state'; import createState from '~/code_navigation/store/state';
const localVue = createLocalVue();
const fetchData = jest.fn(); const fetchData = jest.fn();
const showDefinition = jest.fn(); const showDefinition = jest.fn();
let wrapper; let wrapper;
localVue.use(Vuex); Vue.use(Vuex);
function factory(initialState = {}) { function factory(initialState = {}) {
const store = new Vuex.Store({ const store = new Vuex.Store({
...@@ -24,7 +24,7 @@ function factory(initialState = {}) { ...@@ -24,7 +24,7 @@ function factory(initialState = {}) {
}, },
}); });
wrapper = shallowMount(App, { store, localVue }); wrapper = shallowMount(App, { store });
} }
describe('Code navigation app component', () => { describe('Code navigation app component', () => {
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import CreateEksCluster from '~/create_cluster/eks_cluster/components/create_eks_cluster.vue'; import CreateEksCluster from '~/create_cluster/eks_cluster/components/create_eks_cluster.vue';
import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue'; import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue';
import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue'; import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('CreateEksCluster', () => { describe('CreateEksCluster', () => {
let vm; let vm;
...@@ -33,7 +33,6 @@ describe('CreateEksCluster', () => { ...@@ -33,7 +33,6 @@ describe('CreateEksCluster', () => {
externalLinkIcon, externalLinkIcon,
kubernetesIntegrationHelpPath, kubernetesIntegrationHelpPath,
}, },
localVue,
store, store,
}); });
}); });
......
import { GlFormCheckbox } from '@gitlab/ui'; import { GlFormCheckbox } from '@gitlab/ui';
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
...@@ -7,8 +7,7 @@ import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components ...@@ -7,8 +7,7 @@ import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components
import eksClusterFormState from '~/create_cluster/eks_cluster/store/state'; import eksClusterFormState from '~/create_cluster/eks_cluster/store/state';
import clusterDropdownStoreState from '~/create_cluster/store/cluster_dropdown/state'; import clusterDropdownStoreState from '~/create_cluster/store/cluster_dropdown/state';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('EksClusterConfigurationForm', () => { describe('EksClusterConfigurationForm', () => {
let store; let store;
...@@ -151,7 +150,6 @@ describe('EksClusterConfigurationForm', () => { ...@@ -151,7 +150,6 @@ describe('EksClusterConfigurationForm', () => {
const buildWrapper = () => { const buildWrapper = () => {
vm = shallowMount(EksClusterConfigurationForm, { vm = shallowMount(EksClusterConfigurationForm, {
localVue,
store, store,
propsData: { propsData: {
gitlabManagedClusterHelpPath: '', gitlabManagedClusterHelpPath: '',
......
import { GlButton } from '@gitlab/ui'; import { GlButton } 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 Vuex from 'vuex';
import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue'; import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue';
import eksClusterState from '~/create_cluster/eks_cluster/store/state'; import eksClusterState from '~/create_cluster/eks_cluster/store/state';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('ServiceCredentialsForm', () => { describe('ServiceCredentialsForm', () => {
let vm; let vm;
...@@ -33,7 +33,6 @@ describe('ServiceCredentialsForm', () => { ...@@ -33,7 +33,6 @@ describe('ServiceCredentialsForm', () => {
createRoleArnHelpPath: '', createRoleArnHelpPath: '',
externalLinkIcon: '', externalLinkIcon: '',
}, },
localVue,
store, store,
}); });
}); });
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GkeMachineTypeDropdown from '~/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue'; import GkeMachineTypeDropdown from '~/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue';
import createState from '~/create_cluster/gke_cluster/store/state'; import createState from '~/create_cluster/gke_cluster/store/state';
...@@ -19,15 +20,12 @@ const LABELS = { ...@@ -19,15 +20,12 @@ const LABELS = {
DEFAULT: 'Select machine type', DEFAULT: 'Select machine type',
}; };
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const createComponent = (store, propsData = componentConfig) => const createComponent = (store, propsData = componentConfig) =>
shallowMount(GkeMachineTypeDropdown, { shallowMount(GkeMachineTypeDropdown, {
propsData, propsData,
store, store,
localVue,
}); });
const createStore = (initialState = {}, getters = {}) => const createStore = (initialState = {}, getters = {}) =>
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue';
import GkeNetworkDropdown from '~/create_cluster/gke_cluster/components/gke_network_dropdown.vue'; import GkeNetworkDropdown from '~/create_cluster/gke_cluster/components/gke_network_dropdown.vue';
import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state'; import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('GkeNetworkDropdown', () => { describe('GkeNetworkDropdown', () => {
let wrapper; let wrapper;
...@@ -54,7 +53,6 @@ describe('GkeNetworkDropdown', () => { ...@@ -54,7 +53,6 @@ describe('GkeNetworkDropdown', () => {
shallowMount(GkeNetworkDropdown, { shallowMount(GkeNetworkDropdown, {
propsData, propsData,
store, store,
localVue,
}); });
afterEach(() => { afterEach(() => {
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GkeProjectIdDropdown from '~/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue'; import GkeProjectIdDropdown from '~/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue';
import createState from '~/create_cluster/gke_cluster/store/state'; import createState from '~/create_cluster/gke_cluster/store/state';
...@@ -19,9 +20,7 @@ const LABELS = { ...@@ -19,9 +20,7 @@ const LABELS = {
EMPTY: 'No projects found', EMPTY: 'No projects found',
}; };
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('GkeProjectIdDropdown', () => { describe('GkeProjectIdDropdown', () => {
let wrapper; let wrapper;
...@@ -52,7 +51,6 @@ describe('GkeProjectIdDropdown', () => { ...@@ -52,7 +51,6 @@ describe('GkeProjectIdDropdown', () => {
shallowMount(GkeProjectIdDropdown, { shallowMount(GkeProjectIdDropdown, {
propsData, propsData,
store, store,
localVue,
}); });
const bootstrap = (initialState, getters) => { const bootstrap = (initialState, getters) => {
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import GkeSubmitButton from '~/create_cluster/gke_cluster/components/gke_submit_button.vue'; import GkeSubmitButton from '~/create_cluster/gke_cluster/components/gke_submit_button.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('GkeSubmitButton', () => { describe('GkeSubmitButton', () => {
let wrapper; let wrapper;
...@@ -21,7 +20,6 @@ describe('GkeSubmitButton', () => { ...@@ -21,7 +20,6 @@ describe('GkeSubmitButton', () => {
const buildWrapper = () => const buildWrapper = () =>
shallowMount(GkeSubmitButton, { shallowMount(GkeSubmitButton, {
store, store,
localVue,
}); });
const bootstrap = () => { const bootstrap = () => {
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue';
import GkeSubnetworkDropdown from '~/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue'; import GkeSubnetworkDropdown from '~/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue';
import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state'; import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('GkeSubnetworkDropdown', () => { describe('GkeSubnetworkDropdown', () => {
let wrapper; let wrapper;
...@@ -41,7 +40,6 @@ describe('GkeSubnetworkDropdown', () => { ...@@ -41,7 +40,6 @@ describe('GkeSubnetworkDropdown', () => {
shallowMount(GkeSubnetworkDropdown, { shallowMount(GkeSubnetworkDropdown, {
propsData, propsData,
store, store,
localVue,
}); });
afterEach(() => { afterEach(() => {
......
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import axios from 'axios'; import axios from 'axios';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import Vuex from 'vuex'; import Vuex from 'vuex';
...@@ -15,8 +16,7 @@ import * as utils from '~/vue_shared/components/filtered_search_bar/filtered_sea ...@@ -15,8 +16,7 @@ import * as utils from '~/vue_shared/components/filtered_search_bar/filtered_sea
import initialFiltersState from '~/vue_shared/components/filtered_search_bar/store/modules/filters/state'; import initialFiltersState from '~/vue_shared/components/filtered_search_bar/store/modules/filters/state';
import UrlSync from '~/vue_shared/components/url_sync.vue'; import UrlSync from '~/vue_shared/components/url_sync.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const milestoneTokenType = 'milestone'; const milestoneTokenType = 'milestone';
const labelsTokenType = 'labels'; const labelsTokenType = 'labels';
...@@ -77,7 +77,6 @@ describe('Filter bar', () => { ...@@ -77,7 +77,6 @@ describe('Filter bar', () => {
const createComponent = (initialStore) => { const createComponent = (initialStore) => {
return shallowMount(FilterBar, { return shallowMount(FilterBar, {
localVue,
store: initialStore, store: initialStore,
propsData: { propsData: {
groupPath: 'foo', groupPath: 'foo',
......
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue'; import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue';
import DeployFreezeSettings from '~/deploy_freeze/components/deploy_freeze_settings.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 ...@@ -6,8 +7,7 @@ import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vu
import createStore from '~/deploy_freeze/store'; import createStore from '~/deploy_freeze/store';
import { timezoneDataFixture } from '../helpers'; import { timezoneDataFixture } from '../helpers';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Deploy freeze settings', () => { describe('Deploy freeze settings', () => {
let wrapper; let wrapper;
...@@ -20,7 +20,6 @@ describe('Deploy freeze settings', () => { ...@@ -20,7 +20,6 @@ describe('Deploy freeze settings', () => {
}); });
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = shallowMount(DeployFreezeSettings, { wrapper = shallowMount(DeployFreezeSettings, {
localVue,
store, store,
}); });
}); });
......
import { GlModal } from '@gitlab/ui'; import { GlModal } from '@gitlab/ui';
import { createLocalVue, mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vue'; import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vue';
import createStore from '~/deploy_freeze/store'; import createStore from '~/deploy_freeze/store';
import { RECEIVE_FREEZE_PERIODS_SUCCESS } from '~/deploy_freeze/store/mutation_types'; import { RECEIVE_FREEZE_PERIODS_SUCCESS } from '~/deploy_freeze/store/mutation_types';
import { freezePeriodsFixture, timezoneDataFixture } from '../helpers'; import { freezePeriodsFixture, timezoneDataFixture } from '../helpers';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Deploy freeze table', () => { describe('Deploy freeze table', () => {
let wrapper; let wrapper;
...@@ -21,7 +21,6 @@ describe('Deploy freeze table', () => { ...@@ -21,7 +21,6 @@ describe('Deploy freeze table', () => {
jest.spyOn(store, 'dispatch').mockImplementation(); jest.spyOn(store, 'dispatch').mockImplementation();
wrapper = mount(DeployFreezeTable, { wrapper = mount(DeployFreezeTable, {
attachTo: document.body, attachTo: document.body,
localVue,
store, store,
}); });
}; };
......
import { GlDropdownItem, GlDropdown } from '@gitlab/ui'; 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 Vuex from 'vuex';
import createStore from '~/deploy_freeze/store'; import createStore from '~/deploy_freeze/store';
import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue';
import { findTzByName, formatTz, timezoneDataFixture } from '../helpers'; import { findTzByName, formatTz, timezoneDataFixture } from '../helpers';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Deploy freeze timezone dropdown', () => { describe('Deploy freeze timezone dropdown', () => {
let wrapper; let wrapper;
...@@ -19,7 +19,6 @@ describe('Deploy freeze timezone dropdown', () => { ...@@ -19,7 +19,6 @@ describe('Deploy freeze timezone dropdown', () => {
}); });
wrapper = shallowMount(TimezoneDropdown, { wrapper = shallowMount(TimezoneDropdown, {
store, store,
localVue,
propsData: { propsData: {
value: selectedTimezone, value: selectedTimezone,
timezoneData: timezoneDataFixture, timezoneData: timezoneDataFixture,
......
import { GlIcon, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui'; import { GlIcon, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import Item from '~/design_management/components/list/item.vue'; import Item from '~/design_management/components/list/item.vue';
const localVue = createLocalVue(); Vue.use(VueRouter);
localVue.use(VueRouter);
const router = new VueRouter(); const router = new VueRouter();
// Referenced from: gitlab_schema.graphql:DesignVersionEvent // Referenced from: gitlab_schema.graphql:DesignVersionEvent
...@@ -34,7 +34,6 @@ describe('Design management list item component', () => { ...@@ -34,7 +34,6 @@ describe('Design management list item component', () => {
} = {}) { } = {}) {
wrapper = extendedWrapper( wrapper = extendedWrapper(
shallowMount(Item, { shallowMount(Item, {
localVue,
router, router,
propsData: { propsData: {
id: imgId, id: imgId,
......
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import DeleteButton from '~/design_management/components/delete_button.vue'; import DeleteButton from '~/design_management/components/delete_button.vue';
import Toolbar from '~/design_management/components/toolbar/index.vue'; import Toolbar from '~/design_management/components/toolbar/index.vue';
import { DESIGNS_ROUTE_NAME } from '~/design_management/router/constants'; import { DESIGNS_ROUTE_NAME } from '~/design_management/router/constants';
const localVue = createLocalVue(); Vue.use(VueRouter);
localVue.use(VueRouter);
const router = new VueRouter(); const router = new VueRouter();
const RouterLinkStub = { const RouterLinkStub = {
...@@ -28,7 +28,6 @@ describe('Design management toolbar component', () => { ...@@ -28,7 +28,6 @@ describe('Design management toolbar component', () => {
updatedAt.setHours(updatedAt.getHours() - 1); updatedAt.setHours(updatedAt.getHours() - 1);
wrapper = shallowMount(Toolbar, { wrapper = shallowMount(Toolbar, {
localVue,
router, router,
propsData: { propsData: {
id: '1', id: '1',
......
import { GlAlert } from '@gitlab/ui'; import { GlAlert } from '@gitlab/ui';
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import { ApolloMutation } from 'vue-apollo'; import { ApolloMutation } from 'vue-apollo';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
...@@ -78,8 +79,7 @@ const createDiscussionMutationVariables = { ...@@ -78,8 +79,7 @@ const createDiscussionMutationVariables = {
}, },
}; };
const localVue = createLocalVue(); Vue.use(VueRouter);
localVue.use(VueRouter);
describe('Design management design index page', () => { describe('Design management design index page', () => {
let wrapper; let wrapper;
...@@ -128,7 +128,6 @@ describe('Design management design index page', () => { ...@@ -128,7 +128,6 @@ describe('Design management design index page', () => {
...data, ...data,
}; };
}, },
localVue,
router, router,
}); });
} }
......
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
import VueRouter from 'vue-router'; import VueRouter from 'vue-router';
import App from '~/design_management/components/app.vue'; import App from '~/design_management/components/app.vue';
import DesignDetail from '~/design_management/pages/design/index.vue'; import DesignDetail from '~/design_management/pages/design/index.vue';
...@@ -9,8 +9,7 @@ import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from '~/design_management/route ...@@ -9,8 +9,7 @@ import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from '~/design_management/route
import '~/commons/bootstrap'; import '~/commons/bootstrap';
function factory(routeArg) { function factory(routeArg) {
const localVue = createLocalVue(); Vue.use(VueRouter);
localVue.use(VueRouter);
window.gon = { sprite_icons: '' }; window.gon = { sprite_icons: '' };
...@@ -20,7 +19,6 @@ function factory(routeArg) { ...@@ -20,7 +19,6 @@ function factory(routeArg) {
} }
return mount(App, { return mount(App, {
localVue,
router, router,
mocks: { mocks: {
$apollo: { $apollo: {
......
import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import CollapsedFilesWarning from '~/diffs/components/collapsed_files_warning.vue'; import CollapsedFilesWarning from '~/diffs/components/collapsed_files_warning.vue';
import { CENTERED_LIMITED_CONTAINER_CLASSES, EVT_EXPAND_ALL_FILES } from '~/diffs/constants'; import { CENTERED_LIMITED_CONTAINER_CLASSES, EVT_EXPAND_ALL_FILES } from '~/diffs/constants';
...@@ -23,11 +23,10 @@ async function files(store, count) { ...@@ -23,11 +23,10 @@ async function files(store, count) {
} }
describe('CollapsedFilesWarning', () => { describe('CollapsedFilesWarning', () => {
const localVue = createLocalVue();
let store; let store;
let wrapper; let wrapper;
localVue.use(Vuex); Vue.use(Vuex);
const getAlertActionButton = () => const getAlertActionButton = () =>
wrapper.find(CollapsedFilesWarning).find('button.gl-alert-action:first-child'); wrapper.find(CollapsedFilesWarning).find('button.gl-alert-action:first-child');
...@@ -43,7 +42,6 @@ describe('CollapsedFilesWarning', () => { ...@@ -43,7 +42,6 @@ describe('CollapsedFilesWarning', () => {
wrapper = mounter(CollapsedFilesWarning, { wrapper = mounter(CollapsedFilesWarning, {
propsData: { ...propsData, ...props }, propsData: { ...propsData, ...props },
localVue,
store, store,
}); });
}; };
......
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import getDiffWithCommit from 'test_fixtures/merge_request_diffs/with_commit.json'; import getDiffWithCommit from 'test_fixtures/merge_request_diffs/with_commit.json';
import setWindowLocation from 'helpers/set_window_location_helper'; import setWindowLocation from 'helpers/set_window_location_helper';
...@@ -8,8 +9,7 @@ import CompareVersionsComponent from '~/diffs/components/compare_versions.vue'; ...@@ -8,8 +9,7 @@ import CompareVersionsComponent from '~/diffs/components/compare_versions.vue';
import { createStore } from '~/mr_notes/stores'; import { createStore } from '~/mr_notes/stores';
import diffsMockData from '../mock_data/merge_request_diffs'; import diffsMockData from '../mock_data/merge_request_diffs';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const NEXT_COMMIT_URL = `${TEST_HOST}/?commit_id=next`; const NEXT_COMMIT_URL = `${TEST_HOST}/?commit_id=next`;
const PREV_COMMIT_URL = `${TEST_HOST}/?commit_id=prev`; const PREV_COMMIT_URL = `${TEST_HOST}/?commit_id=prev`;
...@@ -30,7 +30,6 @@ describe('CompareVersions', () => { ...@@ -30,7 +30,6 @@ describe('CompareVersions', () => {
} }
wrapper = mount(CompareVersionsComponent, { wrapper = mount(CompareVersionsComponent, {
localVue,
store, store,
propsData: { propsData: {
mergeRequestDiffs: diffsMockData, mergeRequestDiffs: diffsMockData,
......
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } 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 Vuex from 'vuex';
import DiffContentComponent from '~/diffs/components/diff_content.vue'; import DiffContentComponent from '~/diffs/components/diff_content.vue';
import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; import DiffDiscussions from '~/diffs/components/diff_discussions.vue';
...@@ -11,8 +12,7 @@ import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_prev ...@@ -11,8 +12,7 @@ import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_prev
import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue';
import diffFileMockData from '../mock_data/diff_file'; import diffFileMockData from '../mock_data/diff_file';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('DiffContent', () => { describe('DiffContent', () => {
let wrapper; let wrapper;
...@@ -88,7 +88,6 @@ describe('DiffContent', () => { ...@@ -88,7 +88,6 @@ describe('DiffContent', () => {
...defaultProps, ...defaultProps,
...props, ...props,
}, },
localVue,
store: fakeStore, store: fakeStore,
provide: { glFeatures }, provide: { glFeatures },
}); });
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DiffDiscussionReply from '~/diffs/components/diff_discussion_reply.vue'; import DiffDiscussionReply from '~/diffs/components/diff_discussion_reply.vue';
import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue';
import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue'; import NoteSignedOutWidget from '~/notes/components/note_signed_out_widget.vue';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('DiffDiscussionReply', () => { describe('DiffDiscussionReply', () => {
let wrapper; let wrapper;
...@@ -15,7 +15,6 @@ describe('DiffDiscussionReply', () => { ...@@ -15,7 +15,6 @@ describe('DiffDiscussionReply', () => {
const createComponent = (props = {}, slots = {}) => { const createComponent = (props = {}, slots = {}) => {
wrapper = shallowMount(DiffDiscussionReply, { wrapper = shallowMount(DiffDiscussionReply, {
store, store,
localVue,
propsData: { propsData: {
...props, ...props,
}, },
......
import { GlIcon } from '@gitlab/ui'; import { GlIcon } from '@gitlab/ui';
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; import DiffDiscussions from '~/diffs/components/diff_discussions.vue';
import { createStore } from '~/mr_notes/stores'; import { createStore } from '~/mr_notes/stores';
import DiscussionNotes from '~/notes/components/discussion_notes.vue'; import DiscussionNotes from '~/notes/components/discussion_notes.vue';
...@@ -8,8 +8,6 @@ import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item ...@@ -8,8 +8,6 @@ import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import discussionsMockData from '../mock_data/diff_discussions'; import discussionsMockData from '../mock_data/diff_discussions';
const localVue = createLocalVue();
describe('DiffDiscussions', () => { describe('DiffDiscussions', () => {
let store; let store;
let wrapper; let wrapper;
...@@ -17,13 +15,12 @@ describe('DiffDiscussions', () => { ...@@ -17,13 +15,12 @@ describe('DiffDiscussions', () => {
const createComponent = (props) => { const createComponent = (props) => {
store = createStore(); store = createStore();
wrapper = mount(localVue.extend(DiffDiscussions), { wrapper = mount(DiffDiscussions, {
store, store,
propsData: { propsData: {
discussions: getDiscussionsMockData(), discussions: getDiscussionsMockData(),
...props, ...props,
}, },
localVue,
}); });
}; };
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import { cloneDeep } from 'lodash'; import { cloneDeep } from 'lodash';
import Vuex from 'vuex'; import Vuex from 'vuex';
...@@ -37,8 +38,7 @@ const diffFile = Object.freeze( ...@@ -37,8 +38,7 @@ const diffFile = Object.freeze(
}), }),
); );
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('DiffFileHeader component', () => { describe('DiffFileHeader component', () => {
let wrapper; let wrapper;
...@@ -103,7 +103,6 @@ describe('DiffFileHeader component', () => { ...@@ -103,7 +103,6 @@ describe('DiffFileHeader component', () => {
...props, ...props,
}, },
...options, ...options,
localVue,
store, store,
}); });
}; };
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import DiffContentComponent from 'jh_else_ce/diffs/components/diff_content.vue'; import DiffContentComponent from 'jh_else_ce/diffs/components/diff_content.vue';
...@@ -70,9 +70,7 @@ function markFileToBeRendered(store, index = 0) { ...@@ -70,9 +70,7 @@ function markFileToBeRendered(store, index = 0) {
} }
function createComponent({ file, first = false, last = false, options = {}, props = {} }) { function createComponent({ file, first = false, last = false, options = {}, props = {} }) {
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const store = new Vuex.Store({ const store = new Vuex.Store({
...createNotesStore(), ...createNotesStore(),
...@@ -85,7 +83,6 @@ function createComponent({ file, first = false, last = false, options = {}, prop ...@@ -85,7 +83,6 @@ function createComponent({ file, first = false, last = false, options = {}, prop
const wrapper = shallowMount(DiffFileComponent, { const wrapper = shallowMount(DiffFileComponent, {
store, store,
localVue,
propsData: { propsData: {
file, file,
canCurrentUserFork: false, canCurrentUserFork: false,
...@@ -98,7 +95,6 @@ function createComponent({ file, first = false, last = false, options = {}, prop ...@@ -98,7 +95,6 @@ function createComponent({ file, first = false, last = false, options = {}, prop
}); });
return { return {
localVue,
wrapper, wrapper,
store, store,
}; };
......
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import NoChanges from '~/diffs/components/no_changes.vue'; import NoChanges from '~/diffs/components/no_changes.vue';
import { createStore } from '~/mr_notes/stores'; import { createStore } from '~/mr_notes/stores';
import diffsMockData from '../mock_data/merge_request_diffs'; import diffsMockData from '../mock_data/merge_request_diffs';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const TEST_TARGET_BRANCH = 'foo'; const TEST_TARGET_BRANCH = 'foo';
const TEST_SOURCE_BRANCH = 'dev/update'; const TEST_SOURCE_BRANCH = 'dev/update';
...@@ -17,7 +17,6 @@ describe('Diff no changes empty state', () => { ...@@ -17,7 +17,6 @@ describe('Diff no changes empty state', () => {
function createComponent(mountFn = shallowMount) { function createComponent(mountFn = shallowMount) {
wrapper = mountFn(NoChanges, { wrapper = mountFn(NoChanges, {
localVue,
store, store,
propsData: { propsData: {
changesEmptyStateIllustration: '', changesEmptyStateIllustration: '',
......
import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import TreeList from '~/diffs/components/tree_list.vue'; import TreeList from '~/diffs/components/tree_list.vue';
import createStore from '~/diffs/store/modules'; import createStore from '~/diffs/store/modules';
...@@ -8,13 +9,11 @@ describe('Diffs tree list component', () => { ...@@ -8,13 +9,11 @@ describe('Diffs tree list component', () => {
let wrapper; let wrapper;
let store; let store;
const getFileRows = () => wrapper.findAll('.file-row'); const getFileRows = () => wrapper.findAll('.file-row');
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const createComponent = (mountFn = mount) => { const createComponent = (mountFn = mount) => {
wrapper = mountFn(TreeList, { wrapper = mountFn(TreeList, {
store, store,
localVue,
propsData: { hideFileStats: false }, propsData: { hideFileStats: false },
}); });
}; };
......
...@@ -7,7 +7,8 @@ import { ...@@ -7,7 +7,8 @@ import {
GlAlert, GlAlert,
GlSprintf, GlSprintf,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import { import {
severityLevel, severityLevel,
...@@ -27,8 +28,7 @@ import Tracking from '~/tracking'; ...@@ -27,8 +28,7 @@ import Tracking from '~/tracking';
jest.mock('~/flash'); jest.mock('~/flash');
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('ErrorDetails', () => { describe('ErrorDetails', () => {
let store; let store;
...@@ -53,7 +53,6 @@ describe('ErrorDetails', () => { ...@@ -53,7 +53,6 @@ describe('ErrorDetails', () => {
function mountComponent() { function mountComponent() {
wrapper = shallowMount(ErrorDetails, { wrapper = shallowMount(ErrorDetails, {
stubs: { GlButton, GlSprintf }, stubs: { GlButton, GlSprintf },
localVue,
store, store,
mocks, mocks,
propsData: { propsData: {
......
import { GlEmptyState, GlLoadingIcon, GlFormInput, GlPagination, GlDropdown } from '@gitlab/ui'; import { GlEmptyState, GlLoadingIcon, GlFormInput, GlPagination, GlDropdown } from '@gitlab/ui';
import { createLocalVue, mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import stubChildren from 'helpers/stub_children'; import stubChildren from 'helpers/stub_children';
import ErrorTrackingActions from '~/error_tracking/components/error_tracking_actions.vue'; import ErrorTrackingActions from '~/error_tracking/components/error_tracking_actions.vue';
...@@ -8,8 +9,7 @@ import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '~/err ...@@ -8,8 +9,7 @@ import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '~/err
import Tracking from '~/tracking'; import Tracking from '~/tracking';
import errorsList from './list_mock.json'; import errorsList from './list_mock.json';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('ErrorTrackingList', () => { describe('ErrorTrackingList', () => {
let store; let store;
...@@ -32,7 +32,6 @@ describe('ErrorTrackingList', () => { ...@@ -32,7 +32,6 @@ describe('ErrorTrackingList', () => {
stubs = {}, stubs = {},
} = {}) { } = {}) {
wrapper = mount(ErrorTrackingList, { wrapper = mount(ErrorTrackingList, {
localVue,
store, store,
propsData: { propsData: {
indexPath: '/path', indexPath: '/path',
......
import { GlFormRadioGroup, GlFormRadio, GlFormInputGroup } from '@gitlab/ui'; import { GlFormRadioGroup, GlFormRadio, GlFormInputGroup } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { nextTick } from 'vue'; import Vue, { nextTick } from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
import { TEST_HOST } from 'helpers/test_constants'; import { TEST_HOST } from 'helpers/test_constants';
...@@ -10,8 +10,7 @@ import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracki ...@@ -10,8 +10,7 @@ import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracki
import ProjectDropdown from '~/error_tracking_settings/components/project_dropdown.vue'; import ProjectDropdown from '~/error_tracking_settings/components/project_dropdown.vue';
import createStore from '~/error_tracking_settings/store'; import createStore from '~/error_tracking_settings/store';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
const TEST_GITLAB_DSN = 'https://gitlab.example.com/123456'; const TEST_GITLAB_DSN = 'https://gitlab.example.com/123456';
...@@ -22,7 +21,6 @@ describe('error tracking settings app', () => { ...@@ -22,7 +21,6 @@ describe('error tracking settings app', () => {
function mountComponent() { function mountComponent() {
wrapper = extendedWrapper( wrapper = extendedWrapper(
shallowMount(ErrorTrackingSettings, { shallowMount(ErrorTrackingSettings, {
localVue,
store, // Override the imported store store, // Override the imported store
propsData: { propsData: {
initialEnabled: 'true', initialEnabled: 'true',
......
import { GlFormInput, GlButton } from '@gitlab/ui'; import { GlFormInput, GlButton } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracking_form.vue'; import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracking_form.vue';
import createStore from '~/error_tracking_settings/store'; import createStore from '~/error_tracking_settings/store';
import { defaultProps } from '../mock'; import { defaultProps } from '../mock';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('error tracking settings form', () => { describe('error tracking settings form', () => {
let wrapper; let wrapper;
...@@ -14,7 +14,6 @@ describe('error tracking settings form', () => { ...@@ -14,7 +14,6 @@ describe('error tracking settings form', () => {
function mountComponent() { function mountComponent() {
wrapper = shallowMount(ErrorTrackingForm, { wrapper = shallowMount(ErrorTrackingForm, {
localVue,
store, store,
propsData: defaultProps, propsData: defaultProps,
}); });
......
import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
import { createLocalVue, shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import { pick, clone } from 'lodash'; import { pick, clone } from 'lodash';
import Vuex from 'vuex'; import Vuex from 'vuex';
import ProjectDropdown from '~/error_tracking_settings/components/project_dropdown.vue'; import ProjectDropdown from '~/error_tracking_settings/components/project_dropdown.vue';
import { defaultProps, projectList, staleProject } from '../mock'; import { defaultProps, projectList, staleProject } from '../mock';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('error tracking settings project dropdown', () => { describe('error tracking settings project dropdown', () => {
let wrapper; let wrapper;
function mountComponent() { function mountComponent() {
wrapper = shallowMount(ProjectDropdown, { wrapper = shallowMount(ProjectDropdown, {
localVue,
propsData: { propsData: {
...pick( ...pick(
defaultProps, defaultProps,
......
import { GlAlert, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; import { GlAlert, GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import Vuex from 'vuex'; import Vuex from 'vuex';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
...@@ -13,8 +14,7 @@ import axios from '~/lib/utils/axios_utils'; ...@@ -13,8 +14,7 @@ import axios from '~/lib/utils/axios_utils';
import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
import { getRequestData } from '../mock_data'; import { getRequestData } from '../mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Feature flags', () => { describe('Feature flags', () => {
const mockData = { const mockData = {
...@@ -45,7 +45,6 @@ describe('Feature flags', () => { ...@@ -45,7 +45,6 @@ describe('Feature flags', () => {
const factory = (provide = mockData, fn = mount) => { const factory = (provide = mockData, fn = mount) => {
store = createStore(mockState); store = createStore(mockState);
wrapper = fn(FeatureFlagsComponent, { wrapper = fn(FeatureFlagsComponent, {
localVue,
store, store,
provide, provide,
stubs: { stubs: {
......
import { GlAlert } from '@gitlab/ui'; import { GlAlert } 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 Vuex from 'vuex';
import { TEST_HOST } from 'spec/test_constants'; import { TEST_HOST } from 'spec/test_constants';
import Form from '~/feature_flags/components/form.vue'; import Form from '~/feature_flags/components/form.vue';
...@@ -10,8 +11,7 @@ import { allUsersStrategy } from '../mock_data'; ...@@ -10,8 +11,7 @@ import { allUsersStrategy } from '../mock_data';
const userCalloutId = 'feature_flags_new_version'; const userCalloutId = 'feature_flags_new_version';
const userCalloutsPath = `${TEST_HOST}/user_callouts`; const userCalloutsPath = `${TEST_HOST}/user_callouts`;
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('New feature flag form', () => { describe('New feature flag form', () => {
let wrapper; let wrapper;
...@@ -27,7 +27,6 @@ describe('New feature flag form', () => { ...@@ -27,7 +27,6 @@ describe('New feature flag form', () => {
wrapper = null; wrapper = null;
} }
wrapper = shallowMount(NewFeatureFlag, { wrapper = shallowMount(NewFeatureFlag, {
localVue,
store, store,
provide: { provide: {
showUserCallout: true, showUserCallout: true,
......
import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui';
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import Api from '~/api'; import Api from '~/api';
import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue';
...@@ -12,15 +13,13 @@ const DEFAULT_PROPS = { ...@@ -12,15 +13,13 @@ const DEFAULT_PROPS = {
strategy: userListStrategy, strategy: userListStrategy,
}; };
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('~/feature_flags/components/strategies/gitlab_user_list.vue', () => { describe('~/feature_flags/components/strategies/gitlab_user_list.vue', () => {
let wrapper; let wrapper;
const factory = (props = {}) => const factory = (props = {}) =>
mount(GitlabUserList, { mount(GitlabUserList, {
localVue,
store: createStore({ projectId: '1' }), store: createStore({ projectId: '1' }),
propsData: { ...DEFAULT_PROPS, ...props }, propsData: { ...DEFAULT_PROPS, ...props },
}); });
......
import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui'; import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui';
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import { last } from 'lodash'; import { last } from 'lodash';
import Vuex from 'vuex'; import Vuex from 'vuex';
import Api from '~/api'; import Api from '~/api';
...@@ -26,8 +27,7 @@ const provide = { ...@@ -26,8 +27,7 @@ const provide = {
environmentsEndpoint: '', environmentsEndpoint: '',
}; };
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('Feature flags strategy', () => { describe('Feature flags strategy', () => {
let wrapper; let wrapper;
...@@ -48,7 +48,7 @@ describe('Feature flags strategy', () => { ...@@ -48,7 +48,7 @@ describe('Feature flags strategy', () => {
wrapper.destroy(); wrapper.destroy();
wrapper = null; wrapper = null;
} }
wrapper = mount(Strategy, { localVue, store: createStore({ projectId: '1' }), ...opts }); wrapper = mount(Strategy, { store: createStore({ projectId: '1' }), ...opts });
}; };
beforeEach(() => { beforeEach(() => {
......
import { GlButton } from '@gitlab/ui'; import { GlButton } 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 Vuex from 'vuex';
import { trimText } from 'helpers/text_helper'; import { trimText } from 'helpers/text_helper';
import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
...@@ -8,8 +9,7 @@ import { createStore } from '~/frequent_items/store'; ...@@ -8,8 +9,7 @@ import { createStore } from '~/frequent_items/store';
import ProjectAvatar from '~/vue_shared/components/project_avatar.vue'; import ProjectAvatar from '~/vue_shared/components/project_avatar.vue';
import { mockProject } from '../mock_data'; import { mockProject } from '../mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('FrequentItemsListItemComponent', () => { describe('FrequentItemsListItemComponent', () => {
let wrapper; let wrapper;
...@@ -40,7 +40,6 @@ describe('FrequentItemsListItemComponent', () => { ...@@ -40,7 +40,6 @@ describe('FrequentItemsListItemComponent', () => {
provide: { provide: {
vuexModule: 'frequentProjects', vuexModule: 'frequentProjects',
}, },
localVue,
}); });
}; };
......
import { mount, createLocalVue } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import frequentItemsListComponent from '~/frequent_items/components/frequent_items_list.vue'; import frequentItemsListComponent from '~/frequent_items/components/frequent_items_list.vue';
import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue';
import { createStore } from '~/frequent_items/store'; import { createStore } from '~/frequent_items/store';
import { mockFrequentProjects } from '../mock_data'; import { mockFrequentProjects } from '../mock_data';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('FrequentItemsListComponent', () => { describe('FrequentItemsListComponent', () => {
let wrapper; let wrapper;
...@@ -22,7 +22,6 @@ describe('FrequentItemsListComponent', () => { ...@@ -22,7 +22,6 @@ describe('FrequentItemsListComponent', () => {
matcher: 'lab', matcher: 'lab',
...props, ...props,
}, },
localVue,
provide: { provide: {
vuexModule: 'frequentProjects', vuexModule: 'frequentProjects',
}, },
......
import { GlSearchBoxByType } from '@gitlab/ui'; import { GlSearchBoxByType } 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 Vuex from 'vuex';
import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
import searchComponent from '~/frequent_items/components/frequent_items_search_input.vue'; import searchComponent from '~/frequent_items/components/frequent_items_search_input.vue';
import { createStore } from '~/frequent_items/store'; import { createStore } from '~/frequent_items/store';
const localVue = createLocalVue(); Vue.use(Vuex);
localVue.use(Vuex);
describe('FrequentItemsSearchInputComponent', () => { describe('FrequentItemsSearchInputComponent', () => {
let wrapper; let wrapper;
...@@ -18,7 +18,6 @@ describe('FrequentItemsSearchInputComponent', () => { ...@@ -18,7 +18,6 @@ describe('FrequentItemsSearchInputComponent', () => {
shallowMount(searchComponent, { shallowMount(searchComponent, {
store, store,
propsData: { namespace }, propsData: { namespace },
localVue,
provide: { provide: {
vuexModule: 'frequentProjects', vuexModule: 'frequentProjects',
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment