From 835f1214dcc4e08e3076f269b7b2aa854ea4257a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 14 Feb 2021 18:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/feature_highlight/feature_highlight_helper_spec.js | 2 +- spec/frontend/feature_highlight/feature_highlight_popover_spec.js | 6 +++--- spec/frontend/feature_highlight/feature_highlight_spec.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/frontend/feature_highlight') diff --git a/spec/frontend/feature_highlight/feature_highlight_helper_spec.js b/spec/frontend/feature_highlight/feature_highlight_helper_spec.js index beae5041156..4a13af8897e 100644 --- a/spec/frontend/feature_highlight/feature_highlight_helper_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_helper_spec.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; import { getSelector, dismiss, inserted } from '~/feature_highlight/feature_highlight_helper'; +import axios from '~/lib/utils/axios_utils'; import { togglePopover } from '~/shared/popover'; describe('feature highlight helper', () => { diff --git a/spec/frontend/feature_highlight/feature_highlight_popover_spec.js b/spec/frontend/feature_highlight/feature_highlight_popover_spec.js index 0730cfd453e..1d558366ce8 100644 --- a/spec/frontend/feature_highlight/feature_highlight_popover_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_popover_spec.js @@ -1,8 +1,8 @@ -import { mount } from '@vue/test-utils'; import { GlPopover, GlLink, GlButton } from '@gitlab/ui'; -import FeatureHighlightPopover from '~/feature_highlight/feature_highlight_popover.vue'; -import { dismiss } from '~/feature_highlight/feature_highlight_helper'; +import { mount } from '@vue/test-utils'; import { POPOVER_TARGET_ID } from '~/feature_highlight/constants'; +import { dismiss } from '~/feature_highlight/feature_highlight_helper'; +import FeatureHighlightPopover from '~/feature_highlight/feature_highlight_popover.vue'; jest.mock('~/feature_highlight/feature_highlight_helper'); diff --git a/spec/frontend/feature_highlight/feature_highlight_spec.js b/spec/frontend/feature_highlight/feature_highlight_spec.js index 79c4050c8c4..cf0db0b8bfe 100644 --- a/spec/frontend/feature_highlight/feature_highlight_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_spec.js @@ -1,8 +1,8 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import * as featureHighlight from '~/feature_highlight/feature_highlight'; -import * as popover from '~/shared/popover'; import axios from '~/lib/utils/axios_utils'; +import * as popover from '~/shared/popover'; jest.mock('~/shared/popover'); -- cgit v1.2.3