Commit 38632aa5 authored by Clement Ho's avatar Clement Ho

Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into 'master'

Update spec import path for vue mount component helper

See merge request gitlab-org/gitlab-ce!17880
parents 38bc4acb 85ce8c7e
---
title: Update spec import path for vue mount component helper
merge_request: 17880
author: George Tsiolis
type: performance
import Vue from 'vue'; import Vue from 'vue';
import DiffFileHeader from '~/notes/components/diff_file_header.vue'; import DiffFileHeader from '~/notes/components/diff_file_header.vue';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import mountComponent from '../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
const discussionFixture = 'merge_requests/diff_discussion.json'; const discussionFixture = 'merge_requests/diff_discussion.json';
......
import Vue from 'vue'; import Vue from 'vue';
import DiffWithNote from '~/notes/components/diff_with_note.vue'; import DiffWithNote from '~/notes/components/diff_with_note.vue';
import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
import mountComponent from '../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
const discussionFixture = 'merge_requests/diff_discussion.json'; const discussionFixture = 'merge_requests/diff_discussion.json';
const imageDiscussionFixture = 'merge_requests/image_diff_discussion.json'; const imageDiscussionFixture = 'merge_requests/image_diff_discussion.json';
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import promoteLabelModal from '~/pages/projects/labels/components/promote_label_modal.vue'; import promoteLabelModal from '~/pages/projects/labels/components/promote_label_modal.vue';
import eventHub from '~/pages/projects/labels/event_hub'; import eventHub from '~/pages/projects/labels/event_hub';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import mountComponent from '../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('Promote label modal', () => { describe('Promote label modal', () => {
let vm; let vm;
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import promoteMilestoneModal from '~/pages/milestones/shared/components/promote_milestone_modal.vue'; import promoteMilestoneModal from '~/pages/milestones/shared/components/promote_milestone_modal.vue';
import eventHub from '~/pages/milestones/shared/event_hub'; import eventHub from '~/pages/milestones/shared/event_hub';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('Promote milestone modal', () => { describe('Promote milestone modal', () => {
let vm; let vm;
......
import Vue from 'vue'; import Vue from 'vue';
import toolbar from '~/vue_shared/components/markdown/toolbar.vue'; import toolbar from '~/vue_shared/components/markdown/toolbar.vue';
import mountComponent from '../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
describe('toolbar', () => { describe('toolbar', () => {
let vm; let vm;
......
...@@ -3,9 +3,9 @@ import Vue from 'vue'; ...@@ -3,9 +3,9 @@ import Vue from 'vue';
import LabelsSelect from '~/labels_select'; import LabelsSelect from '~/labels_select';
import baseComponent from '~/vue_shared/components/sidebar/labels_select/base.vue'; import baseComponent from '~/vue_shared/components/sidebar/labels_select/base.vue';
import { mockConfig, mockLabels } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockConfig, mockLabels } from './mock_data';
const createComponent = (config = mockConfig) => { const createComponent = (config = mockConfig) => {
const Component = Vue.extend(baseComponent); const Component = Vue.extend(baseComponent);
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownButtonComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_button.vue'; import dropdownButtonComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_button.vue';
import { mockConfig, mockLabels } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockConfig, mockLabels } from './mock_data';
const componentConfig = Object.assign({}, mockConfig, { const componentConfig = Object.assign({}, mockConfig, {
fieldName: 'label_id[]', fieldName: 'label_id[]',
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownCreateLabelComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue'; import dropdownCreateLabelComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue';
import { mockSuggestedColors } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockSuggestedColors } from './mock_data';
const createComponent = (headerTitle) => { const createComponent = (headerTitle) => {
const Component = Vue.extend(dropdownCreateLabelComponent); const Component = Vue.extend(dropdownCreateLabelComponent);
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownFooterComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_footer.vue'; import dropdownFooterComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_footer.vue';
import { mockConfig } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockConfig } from './mock_data';
const createComponent = ( const createComponent = (
labelsWebUrl = mockConfig.labelsWebUrl, labelsWebUrl = mockConfig.labelsWebUrl,
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import dropdownHeaderComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_header.vue'; import dropdownHeaderComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_header.vue';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
const createComponent = () => { const createComponent = () => {
const Component = Vue.extend(dropdownHeaderComponent); const Component = Vue.extend(dropdownHeaderComponent);
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownHiddenInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_hidden_input.vue'; import dropdownHiddenInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_hidden_input.vue';
import { mockLabels } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockLabels } from './mock_data';
const createComponent = (name = 'label_id[]', label = mockLabels[0]) => { const createComponent = (name = 'label_id[]', label = mockLabels[0]) => {
const Component = Vue.extend(dropdownHiddenInputComponent); const Component = Vue.extend(dropdownHiddenInputComponent);
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import dropdownSearchInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_search_input.vue'; import dropdownSearchInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_search_input.vue';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
const createComponent = () => { const createComponent = () => {
const Component = Vue.extend(dropdownSearchInputComponent); const Component = Vue.extend(dropdownSearchInputComponent);
......
...@@ -2,7 +2,7 @@ import Vue from 'vue'; ...@@ -2,7 +2,7 @@ import Vue from 'vue';
import dropdownTitleComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_title.vue'; import dropdownTitleComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_title.vue';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
const createComponent = (canEdit = true) => { const createComponent = (canEdit = true) => {
const Component = Vue.extend(dropdownTitleComponent); const Component = Vue.extend(dropdownTitleComponent);
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownValueCollapsedComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue'; import dropdownValueCollapsedComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue';
import { mockLabels } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockLabels } from './mock_data';
const createComponent = (labels = mockLabels) => { const createComponent = (labels = mockLabels) => {
const Component = Vue.extend(dropdownValueCollapsedComponent); const Component = Vue.extend(dropdownValueCollapsedComponent);
......
...@@ -2,9 +2,9 @@ import Vue from 'vue'; ...@@ -2,9 +2,9 @@ import Vue from 'vue';
import dropdownValueComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value.vue'; import dropdownValueComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value.vue';
import { mockConfig, mockLabels } from './mock_data'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import mountComponent from '../../../../helpers/vue_mount_component_helper'; import { mockConfig, mockLabels } from './mock_data';
const createComponent = ( const createComponent = (
labels = mockLabels, labels = mockLabels,
......
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