diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:51 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 12:07:51 +0300 |
commit | 97d4d926630822d0e1a638206909679c962d2f0a (patch) | |
tree | ef885fdbd0f255f901a587fc3d01bdf115fa3a27 /spec/javascripts/frequent_items | |
parent | cfc792b9ca064990e6540cb742e80529ea669a81 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/frequent_items')
4 files changed, 5 insertions, 5 deletions
diff --git a/spec/javascripts/frequent_items/components/app_spec.js b/spec/javascripts/frequent_items/components/app_spec.js index da0427d650a..b293ed541fd 100644 --- a/spec/javascripts/frequent_items/components/app_spec.js +++ b/spec/javascripts/frequent_items/components/app_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import Vue from 'vue'; +import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; +import axios from '~/lib/utils/axios_utils'; import appComponent from '~/frequent_items/components/app.vue'; import eventHub from '~/frequent_items/event_hub'; import store from '~/frequent_items/store'; import { FREQUENT_ITEMS, HOUR_IN_MS } from '~/frequent_items/constants'; import { getTopFrequentItems } from '~/frequent_items/utils'; -import { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper'; import { currentSession, mockFrequentProjects, mockSearchedProjects } from '../mock_data'; let session; diff --git a/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js b/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js index 27c79b9c34c..9bf3e02557f 100644 --- a/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js +++ b/spec/javascripts/frequent_items/components/frequent_items_list_item_spec.js @@ -1,6 +1,6 @@ -import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import { trimText } from 'spec/helpers/text_helper'; +import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; import { mockProject } from '../mock_data'; // can also use 'mockGroup', but not useful to test here const localVue = createLocalVue(); diff --git a/spec/javascripts/frequent_items/components/frequent_items_list_spec.js b/spec/javascripts/frequent_items/components/frequent_items_list_spec.js index 8518a681a26..3fcd79480cc 100644 --- a/spec/javascripts/frequent_items/components/frequent_items_list_spec.js +++ b/spec/javascripts/frequent_items/components/frequent_items_list_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import frequentItemsListComponent from '~/frequent_items/components/frequent_items_list.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import frequentItemsListComponent from '~/frequent_items/components/frequent_items_list.vue'; import { mockFrequentProjects } from '../mock_data'; const createComponent = (namespace = 'projects') => { diff --git a/spec/javascripts/frequent_items/components/frequent_items_search_input_spec.js b/spec/javascripts/frequent_items/components/frequent_items_search_input_spec.js index c548c16c022..be11af8428f 100644 --- a/spec/javascripts/frequent_items/components/frequent_items_search_input_spec.js +++ b/spec/javascripts/frequent_items/components/frequent_items_search_input_spec.js @@ -1,6 +1,6 @@ +import { shallowMount, createLocalVue } from '@vue/test-utils'; import searchComponent from '~/frequent_items/components/frequent_items_search_input.vue'; import eventHub from '~/frequent_items/event_hub'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; const localVue = createLocalVue(); |