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/whats_new | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'spec/frontend/whats_new')
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/frontend/whats_new/components/app_spec.js b/spec/frontend/whats_new/components/app_spec.js index 13e6bec47ab..ad062d04140 100644 --- a/spec/frontend/whats_new/components/app_spec.js +++ b/spec/frontend/whats_new/components/app_spec.js @@ -1,6 +1,6 @@ +import { GlDrawer, GlInfiniteScroll, GlTabs } from '@gitlab/ui'; import { createLocalVue, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlDrawer, GlInfiniteScroll, GlTabs } from '@gitlab/ui'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import App from '~/whats_new/components/app.vue'; diff --git a/spec/frontend/whats_new/store/actions_spec.js b/spec/frontend/whats_new/store/actions_spec.js index 82f17a2726f..c4125d28aba 100644 --- a/spec/frontend/whats_new/store/actions_spec.js +++ b/spec/frontend/whats_new/store/actions_spec.js @@ -1,10 +1,10 @@ -import testAction from 'helpers/vuex_action_helper'; -import { useLocalStorageSpy } from 'helpers/local_storage_helper'; import MockAdapter from 'axios-mock-adapter'; +import { useLocalStorageSpy } from 'helpers/local_storage_helper'; +import testAction from 'helpers/vuex_action_helper'; import waitForPromises from 'helpers/wait_for_promises'; +import axios from '~/lib/utils/axios_utils'; import actions from '~/whats_new/store/actions'; import * as types from '~/whats_new/store/mutation_types'; -import axios from '~/lib/utils/axios_utils'; describe('whats new actions', () => { describe('openDrawer', () => { diff --git a/spec/frontend/whats_new/store/mutations_spec.js b/spec/frontend/whats_new/store/mutations_spec.js index 4967fb51d2b..a95c6885a77 100644 --- a/spec/frontend/whats_new/store/mutations_spec.js +++ b/spec/frontend/whats_new/store/mutations_spec.js @@ -1,6 +1,6 @@ +import * as types from '~/whats_new/store/mutation_types'; import mutations from '~/whats_new/store/mutations'; import createState from '~/whats_new/store/state'; -import * as types from '~/whats_new/store/mutation_types'; describe('whats new mutations', () => { let state; diff --git a/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js b/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js index d096a3cbdc6..b199f4f0c49 100644 --- a/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js +++ b/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlDrawer } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { getDrawerBodyHeight } from '~/whats_new/utils/get_drawer_body_height'; describe('~/whats_new/utils/get_drawer_body_height', () => { |