diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 21:42:06 +0300 |
commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/frontend/projects/commits | |
parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/frontend/projects/commits')
-rw-r--r-- | spec/frontend/projects/commits/components/author_select_spec.js | 6 | ||||
-rw-r--r-- | spec/frontend/projects/commits/store/actions_spec.js | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/frontend/projects/commits/components/author_select_spec.js b/spec/frontend/projects/commits/components/author_select_spec.js index dab91d8b37c..d6fac6f5f79 100644 --- a/spec/frontend/projects/commits/components/author_select_spec.js +++ b/spec/frontend/projects/commits/components/author_select_spec.js @@ -1,14 +1,14 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import * as urlUtility from '~/lib/utils/url_utility'; -import AuthorSelect from '~/projects/commits/components/author_select.vue'; -import { createStore } from '~/projects/commits/store'; import { GlNewDropdown, GlNewDropdownHeader, GlSearchBoxByType, GlNewDropdownItem, } from '@gitlab/ui'; +import * as urlUtility from '~/lib/utils/url_utility'; +import AuthorSelect from '~/projects/commits/components/author_select.vue'; +import { createStore } from '~/projects/commits/store'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/projects/commits/store/actions_spec.js b/spec/frontend/projects/commits/store/actions_spec.js index 886224252ad..a842aaa2a76 100644 --- a/spec/frontend/projects/commits/store/actions_spec.js +++ b/spec/frontend/projects/commits/store/actions_spec.js @@ -1,10 +1,10 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import * as types from '~/projects/commits/store/mutation_types'; import testAction from 'helpers/vuex_action_helper'; +import * as types from '~/projects/commits/store/mutation_types'; import actions from '~/projects/commits/store/actions'; import createState from '~/projects/commits/store/state'; -import createFlash from '~/flash'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); |