Skip to content
Snippets Groups Projects
Commit ec75980b authored by Kushal Pandya's avatar Kushal Pandya
Browse files

Merge branch 'winniehell-remove-local-vue-analytics' into 'master'

Use global Vue instance in Jest (analytics)

See merge request gitlab-org/gitlab!76399
parents 2d174887 165a756a
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -5,11 +5,9 @@ import {
GlLoadingIcon,
GlIcon,
} from '@gitlab/ui';
import { shallowMount, createLocalVue } from '@vue/test-utils';
import { shallowMount } from '@vue/test-utils';
import SelectProjectsDropdown from 'ee/analytics/repository_analytics/components/select_projects_dropdown.vue';
 
const localVue = createLocalVue();
describe('Select projects dropdown component', () => {
let wrapper;
 
Loading
Loading
@@ -22,7 +20,6 @@ describe('Select projects dropdown component', () => {
 
const createComponent = ({ data = {}, apolloGroupProjects = {} } = {}) => {
wrapper = shallowMount(SelectProjectsDropdown, {
localVue,
data() {
return {
groupProjects: [
Loading
Loading
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import { GlSingleStat } from '@gitlab/ui/dist/charts';
import { shallowMount, createLocalVue } from '@vue/test-utils';
import { shallowMount } from '@vue/test-utils';
import TestCoverageSummary from 'ee/analytics/repository_analytics/components/test_coverage_summary.vue';
import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 
const localVue = createLocalVue();
describe('Test coverage table component', () => {
let wrapper;
 
Loading
Loading
@@ -21,7 +19,6 @@ describe('Test coverage table component', () => {
const createComponent = ({ data = {} } = {}) => {
wrapper = extendedWrapper(
shallowMount(TestCoverageSummary, {
localVue,
data() {
return {
projectCount: null,
Loading
Loading
import { GlTable } from '@gitlab/ui';
import { mount, shallowMount, createLocalVue } from '@vue/test-utils';
import { nextTick } from 'vue';
import { mount, shallowMount } from '@vue/test-utils';
import Vue, { nextTick } from 'vue';
import VueApollo from 'vue-apollo';
import SelectProjectsDropdown from 'ee/analytics/repository_analytics/components/select_projects_dropdown.vue';
import TestCoverageTable from 'ee/analytics/repository_analytics/components/test_coverage_table.vue';
Loading
Loading
@@ -14,8 +14,7 @@ import { defaultTestCoverageTable, projects } from '../mock_data';
 
jest.mock('~/api.js');
 
const localVue = createLocalVue();
localVue.use(VueApollo);
Vue.use(VueApollo);
 
describe('Test coverage table component', () => {
let wrapper;
Loading
Loading
@@ -48,7 +47,6 @@ describe('Test coverage table component', () => {
 
wrapper = extendedWrapper(
mountFn(TestCoverageTable, {
localVue,
apolloProvider: mockApollo,
data() {
return {
Loading
Loading
import { GlAlert } from '@gitlab/ui';
import { GlLineChart } from '@gitlab/ui/dist/charts';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import VueApollo from 'vue-apollo';
import createMockApollo from 'helpers/mock_apollo_helper';
import UsageTrendsCountChart from '~/analytics/usage_trends/components/usage_trends_count_chart.vue';
Loading
Loading
@@ -9,8 +10,7 @@ import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleto
import { mockQueryResponse, mockApolloResponse } from '../apollo_mock_data';
import { mockCountsData1 } from '../mock_data';
 
const localVue = createLocalVue();
localVue.use(VueApollo);
Vue.use(VueApollo);
 
const loadChartErrorMessage = 'My load error message';
const noDataMessage = 'My no data message';
Loading
Loading
@@ -39,7 +39,6 @@ describe('UsageTrendsCountChart', () => {
 
const createComponent = ({ responseHandler }) => {
return shallowMount(UsageTrendsCountChart, {
localVue,
apolloProvider: createMockApollo([[statsQuery, responseHandler]]),
propsData: { ...mockChartConfig },
});
Loading
Loading
import { GlAlert } from '@gitlab/ui';
import { GlAreaChart } from '@gitlab/ui/dist/charts';
import { createLocalVue, shallowMount } from '@vue/test-utils';
import { shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import VueApollo from 'vue-apollo';
import createMockApollo from 'helpers/mock_apollo_helper';
import UsersChart from '~/analytics/usage_trends/components/users_chart.vue';
Loading
Loading
@@ -13,8 +14,7 @@ import {
roundedSortedCountsMonthlyChartData2,
} from '../mock_data';
 
const localVue = createLocalVue();
localVue.use(VueApollo);
Vue.use(VueApollo);
 
describe('UsersChart', () => {
let wrapper;
Loading
Loading
@@ -34,7 +34,6 @@ describe('UsersChart', () => {
endDate: new Date(2020, 10, 1),
totalDataPoints: mockCountsData2.length,
},
localVue,
apolloProvider: createMockApollo([[usersQuery, queryHandler]]),
data() {
return { loadingError };
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment