diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /spec/frontend/milestones | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/milestones')
-rw-r--r-- | spec/frontend/milestones/milestone_combobox_spec.js | 8 | ||||
-rw-r--r-- | spec/frontend/milestones/stores/actions_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/milestones/stores/mutations_spec.js | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/spec/frontend/milestones/milestone_combobox_spec.js b/spec/frontend/milestones/milestone_combobox_spec.js index 8c519abe382..4d1a0a0a440 100644 --- a/spec/frontend/milestones/milestone_combobox_spec.js +++ b/spec/frontend/milestones/milestone_combobox_spec.js @@ -1,13 +1,13 @@ -import Vue, { nextTick } from 'vue'; -import Vuex from 'vuex'; +import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; +import Vue, { nextTick } from 'vue'; +import Vuex from 'vuex'; import { ENTER_KEY } from '~/lib/utils/keys'; import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; -import { projectMilestones, groupMilestones } from './mock_data'; import createStore from '~/milestones/stores/'; +import { projectMilestones, groupMilestones } from './mock_data'; const extraLinks = [ { text: 'Create new', url: 'http://127.0.0.1:3000/h5bp/html5-boilerplate/-/milestones/new' }, diff --git a/spec/frontend/milestones/stores/actions_spec.js b/spec/frontend/milestones/stores/actions_spec.js index a62b0c49a80..4355ea71fb2 100644 --- a/spec/frontend/milestones/stores/actions_spec.js +++ b/spec/frontend/milestones/stores/actions_spec.js @@ -1,7 +1,7 @@ import testAction from 'helpers/vuex_action_helper'; -import createState from '~/milestones/stores/state'; import * as actions from '~/milestones/stores/actions'; import * as types from '~/milestones/stores/mutation_types'; +import createState from '~/milestones/stores/state'; let mockProjectMilestonesReturnValue; let mockGroupMilestonesReturnValue; diff --git a/spec/frontend/milestones/stores/mutations_spec.js b/spec/frontend/milestones/stores/mutations_spec.js index 0b69a9d572d..91b2acf23c5 100644 --- a/spec/frontend/milestones/stores/mutations_spec.js +++ b/spec/frontend/milestones/stores/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/milestones/stores/state'; -import mutations from '~/milestones/stores/mutations'; import * as types from '~/milestones/stores/mutation_types'; +import mutations from '~/milestones/stores/mutations'; +import createState from '~/milestones/stores/state'; describe('Milestones combobox Vuex store mutations', () => { let state; |