Commit b72e54f5 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'xanf-remove-localVue-121601' into 'master'

Remove incorrect localVue usage in ee/spec/frontend/related_items_tree

Closes #121601

See merge request gitlab-org/gitlab!22585
parents 5c5299f4 3b587d6f
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import RelatedItemsTreeApp from 'ee/related_items_tree/components/related_items_tree_app.vue'; import RelatedItemsTreeApp from 'ee/related_items_tree/components/related_items_tree_app.vue';
...@@ -19,8 +19,6 @@ import { ...@@ -19,8 +19,6 @@ import {
mockParentItem, mockParentItem,
} from '../../../javascripts/related_items_tree/mock_data'; } from '../../../javascripts/related_items_tree/mock_data';
const localVue = createLocalVue();
const mockProjects = getJSONFixture('static/projects.json'); const mockProjects = getJSONFixture('static/projects.json');
const createComponent = () => { const createComponent = () => {
...@@ -29,8 +27,7 @@ const createComponent = () => { ...@@ -29,8 +27,7 @@ const createComponent = () => {
store.dispatch('setInitialConfig', mockInitialConfig); store.dispatch('setInitialConfig', mockInitialConfig);
store.dispatch('setInitialParentItem', mockParentItem); store.dispatch('setInitialParentItem', mockParentItem);
return shallowMount(localVue.extend(RelatedItemsTreeApp), { return shallowMount(RelatedItemsTreeApp, {
localVue,
store, store,
sync: false, sync: false,
}); });
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import RelatedItemsTreeHeader from 'ee/related_items_tree/components/related_items_tree_header.vue'; import RelatedItemsTreeHeader from 'ee/related_items_tree/components/related_items_tree_header.vue';
...@@ -15,7 +15,6 @@ import { ...@@ -15,7 +15,6 @@ import {
const createComponent = ({ slots } = {}) => { const createComponent = ({ slots } = {}) => {
const store = createDefaultStore(); const store = createDefaultStore();
const localVue = createLocalVue();
const children = epicUtils.processQueryResponse(mockQueryResponse.data.group); const children = epicUtils.processQueryResponse(mockQueryResponse.data.group);
store.dispatch('setInitialParentItem', mockParentItem); store.dispatch('setInitialParentItem', mockParentItem);
...@@ -33,7 +32,6 @@ const createComponent = ({ slots } = {}) => { ...@@ -33,7 +32,6 @@ const createComponent = ({ slots } = {}) => {
return shallowMount(RelatedItemsTreeHeader, { return shallowMount(RelatedItemsTreeHeader, {
attachToDocument: true, attachToDocument: true,
sync: false, sync: false,
localVue,
store, store,
slots, slots,
}); });
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlButton, GlLink } from '@gitlab/ui'; import { GlButton, GlLink } from '@gitlab/ui';
import ItemWeight from 'ee/boards/components/issue_card_weight.vue'; import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
...@@ -28,8 +28,6 @@ const mockItem = Object.assign({}, mockIssue1, { ...@@ -28,8 +28,6 @@ const mockItem = Object.assign({}, mockIssue1, {
assignees: epicUtils.extractIssueAssignees(mockIssue1.assignees), assignees: epicUtils.extractIssueAssignees(mockIssue1.assignees),
}); });
const localVue = createLocalVue();
const createComponent = (parentItem = mockParentItem, item = mockItem) => { const createComponent = (parentItem = mockParentItem, item = mockItem) => {
const store = createDefaultStore(); const store = createDefaultStore();
const children = epicUtils.processQueryResponse(mockQueryResponse.data.group); const children = epicUtils.processQueryResponse(mockQueryResponse.data.group);
...@@ -49,7 +47,6 @@ const createComponent = (parentItem = mockParentItem, item = mockItem) => { ...@@ -49,7 +47,6 @@ const createComponent = (parentItem = mockParentItem, item = mockItem) => {
return shallowMount(TreeItemBody, { return shallowMount(TreeItemBody, {
attachToDocument: true, attachToDocument: true,
sync: false, sync: false,
localVue,
store, store,
propsData: { propsData: {
parentItem, parentItem,
......
import { shallowMount, createLocalVue } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import { GlButton, GlLoadingIcon } from '@gitlab/ui'; import { GlButton, GlLoadingIcon } from '@gitlab/ui';
import TreeItem from 'ee/related_items_tree/components/tree_item.vue'; import TreeItem from 'ee/related_items_tree/components/tree_item.vue';
...@@ -23,8 +23,6 @@ const mockItem = Object.assign({}, mockEpic1, { ...@@ -23,8 +23,6 @@ const mockItem = Object.assign({}, mockEpic1, {
pathIdSeparator: PathIdSeparator.Epic, pathIdSeparator: PathIdSeparator.Epic,
}); });
const localVue = createLocalVue();
const createComponent = (parentItem = mockParentItem, item = mockItem) => { const createComponent = (parentItem = mockParentItem, item = mockItem) => {
const store = createDefaultStore(); const store = createDefaultStore();
const children = epicUtils.processQueryResponse(mockQueryResponse.data.group); const children = epicUtils.processQueryResponse(mockQueryResponse.data.group);
...@@ -45,8 +43,7 @@ const createComponent = (parentItem = mockParentItem, item = mockItem) => { ...@@ -45,8 +43,7 @@ const createComponent = (parentItem = mockParentItem, item = mockItem) => {
isSubItem: true, isSubItem: true,
}); });
return shallowMount(localVue.extend(TreeItem), { return shallowMount(TreeItem, {
localVue,
store, store,
stubs: { stubs: {
'tree-root': TreeRoot, 'tree-root': TreeRoot,
......
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