Merge branch 'vs-sort-imports-by-groups-in-specs' into 'master'

Sort imports by groups in CE specs

See merge request gitlab-org/gitlab!52976

spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js

@@ -2,11 +2,11 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import Vuex from 'vuex';
 import { GlModal, GlSearchBoxByType } from '@gitlab/ui';
 import AddReviewItemsModal from '~/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue';
-import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit';
 import defaultState from '~/add_context_commits_modal/store/state';
 import mutations from '~/add_context_commits_modal/store/mutations';
 import * as actions from '~/add_context_commits_modal/store/actions';
+import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit';
 const localVue = createLocalVue();
 localVue.use(Vuex);

spec/frontend/alert_management/components/alert_metrics_spec.js

 import { shallowMount } from '@vue/test-utils';
-import waitForPromises from 'helpers/wait_for_promises';
 import MockAdapter from 'axios-mock-adapter';
 import axios from 'axios';
+import waitForPromises from 'helpers/wait_for_promises';
 import AlertMetrics from '~/alert_management/components/alert_metrics.vue';
 import MetricEmbed from '~/monitoring/components/embeds/metric_embed.vue';

spec/frontend/alerts_settings/components/alerts_settings_form_spec.js

@@ -10,8 +10,8 @@ import {
 import waitForPromises from 'helpers/wait_for_promises';
 import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue';
 import MappingBuilder from '~/alerts_settings/components/alert_mapping_builder.vue';
-import { defaultAlertSettingsConfig } from './util';
 import { typeSet } from '~/alerts_settings/constants';
+import { defaultAlertSettingsConfig } from './util';
 describe('AlertsSettingsFormNew', () => {
   let wrapper;

spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js

 import VueApollo from 'vue-apollo';
 import { mount, createLocalVue } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
+import { GlLoadingIcon } from '@gitlab/ui';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
-import { GlLoadingIcon } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import AlertsSettingsWrapper from '~/alerts_settings/components/alerts_settings_wrapper.vue';
 import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue';

spec/frontend/blob/components/blob_content_spec.js

@@ -7,6 +7,7 @@ import {
   BLOB_RENDER_EVENT_SHOW_SOURCE,
   BLOB_RENDER_ERRORS,
 } from '~/blob/components/constants';
+import { RichViewer, SimpleViewer } from '~/vue_shared/components/blob_viewers';
 import {
   Blob,
   RichViewerMock,
@@ -14,7 +15,6 @@ import {
   RichBlobContentMock,
   SimpleBlobContentMock,
 } from './mock_data';
-import { RichViewer, SimpleViewer } from '~/vue_shared/components/blob_viewers';
 describe('Blob Content component', () => {
   let wrapper;

spec/frontend/blob/components/blob_header_filepath_spec.js

 import { shallowMount } from '@vue/test-utils';
 import BlobHeaderFilepath from '~/blob/components/blob_header_filepath.vue';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
-import { Blob as MockBlob } from './mock_data';
 import { numberToHumanSize } from '~/lib/utils/number_utils';
+import { Blob as MockBlob } from './mock_data';
 jest.mock('~/lib/utils/number_utils', () => ({
   numberToHumanSize: jest.fn(() => 'a lot'),

spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js

 import { shallowMount } from '@vue/test-utils';
-import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper';
 import { GlButton } from '@gitlab/ui';
+import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper';
 import Popover from '~/blob/suggest_gitlab_ci_yml/components/popover.vue';
 import * as utils from '~/lib/utils/common_utils';

spec/frontend/boards/board_list_deprecated_spec.js

@@ -9,9 +9,9 @@ import eventHub from '~/boards/eventhub';
 import BoardList from '~/boards/components/board_list_deprecated.vue';
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor } from './mock_data';
 import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
+import { listObj, boardsMockInterceptor } from './mock_data';
 const createComponent = ({ done, listIssueProps = {}, componentProps = {}, listProps = {} }) => {
   const el = document.createElement('div');

spec/frontend/boards/board_list_helper.js

@@ -9,9 +9,9 @@ import BoardList from '~/boards/components/board_list_deprecated.vue';
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor } from './mock_data';
 import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
+import { listObj, boardsMockInterceptor } from './mock_data';
 window.Sortable = Sortable;

spec/frontend/boards/board_list_spec.js

 import Vuex from 'vuex';
-import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame';
 import { createLocalVue, mount } from '@vue/test-utils';
+import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame';
 import eventHub from '~/boards/eventhub';
 import BoardList from '~/boards/components/board_list.vue';
 import BoardCard from '~/boards/components/board_card.vue';
-import { mockList, mockIssuesByListId, issues, mockIssues } from './mock_data';
 import defaultState from '~/boards/stores/state';
+import { mockList, mockIssuesByListId, issues, mockIssues } from './mock_data';
 const localVue = createLocalVue();
 localVue.use(Vuex);

spec/frontend/boards/boards_store_spec.js

@@ -3,10 +3,10 @@ import { TEST_HOST } from 'helpers/test_constants';
 import axios from '~/lib/utils/axios_utils';
 import boardsStore from '~/boards/stores/boards_store';
 import eventHub from '~/boards/eventhub';
-import { listObj, listObjDuplicate } from './mock_data';
 import ListIssue from '~/boards/models/issue';
 import List from '~/boards/models/list';
+import { listObj, listObjDuplicate } from './mock_data';
 jest.mock('js-cookie');

spec/frontend/boards/components/board_assignee_dropdown_spec.js

@@ -6,8 +6,8 @@ import {
   GlSearchBoxByType,
   GlLoadingIcon,
 } from '@gitlab/ui';
-import createMockApollo from 'helpers/mock_apollo_helper';
 import VueApollo from 'vue-apollo';
+import createMockApollo from 'helpers/mock_apollo_helper';
 import BoardAssigneeDropdown from '~/boards/components/board_assignee_dropdown.vue';
 import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue';
 import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';

spec/frontend/boards/components/board_card_layout_deprecated_spec.js

@@ -15,9 +15,8 @@ import boardsVuexStore from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 import BoardCardLayout from '~/boards/components/board_card_layout_deprecated.vue';
 import issueCardInner from '~/boards/components/issue_card_inner.vue';
-import { listObj, boardsMockInterceptor, setMockEndpoints } from '../mock_data';
-
 import { ISSUABLE } from '~/boards/constants';
+import { listObj, boardsMockInterceptor, setMockEndpoints } from '../mock_data';
 describe('Board card layout', () => {
   let wrapper;

spec/frontend/boards/components/board_card_layout_spec.js

@@ -4,9 +4,8 @@ import { createLocalVue, shallowMount } from '@vue/test-utils';
 import defaultState from '~/boards/stores/state';
 import BoardCardLayout from '~/boards/components/board_card_layout.vue';
 import IssueCardInner from '~/boards/components/issue_card_inner.vue';
-import { mockLabelList, mockIssue } from '../mock_data';
-
 import { ISSUABLE } from '~/boards/constants';
+import { mockLabelList, mockIssue } from '../mock_data';
 describe('Board card layout', () => {
   let wrapper;

spec/frontend/boards/components/board_content_spec.js

@@ -5,8 +5,8 @@ import Draggable from 'vuedraggable';
 import EpicsSwimlanes from 'ee_component/boards/components/epics_swimlanes.vue';
 import getters from 'ee_else_ce/boards/stores/getters';
 import BoardColumnDeprecated from '~/boards/components/board_column_deprecated.vue';
-import { mockLists, mockListsWithModel } from '../mock_data';
 import BoardContent from '~/boards/components/board_content.vue';
+import { mockLists, mockListsWithModel } from '../mock_data';
 const localVue = createLocalVue();
 localVue.use(Vuex);

spec/frontend/boards/components/board_form_spec.js

 import { shallowMount } from '@vue/test-utils';
-import { TEST_HOST } from 'helpers/test_constants';
 import { GlModal } from '@gitlab/ui';
+import { TEST_HOST } from 'helpers/test_constants';
 import waitForPromises from 'helpers/wait_for_promises';
 import { deprecatedCreateFlash as createFlash } from '~/flash';

spec/frontend/boards/components/sidebar/board_sidebar_subscription_spec.js

@@ -4,8 +4,8 @@ import { GlToggle, GlLoadingIcon } from '@gitlab/ui';
 import BoardSidebarSubscription from '~/boards/components/sidebar/board_sidebar_subscription.vue';
 import * as types from '~/boards/stores/mutation_types';
 import { createStore } from '~/boards/stores';
-import { mockActiveIssue } from '../../mock_data';
 import createFlash from '~/flash';
+import { mockActiveIssue } from '../../mock_data';
 jest.mock('~/flash.js');

spec/frontend/boards/issue_card_deprecated_spec.js

@@ -7,8 +7,8 @@ import '~/boards/models/issue';
 import '~/boards/models/list';
 import { GlLabel } from '@gitlab/ui';
 import IssueCardInner from '~/boards/components/issue_card_inner_deprecated.vue';
-import { listObj } from './mock_data';
 import store from '~/boards/stores';
+import { listObj } from './mock_data';
 describe('Issue card component', () => {
   const user = new ListAssignee({

spec/frontend/boards/issue_card_inner_spec.js

@@ -2,10 +2,10 @@ import { mount } from '@vue/test-utils';
 import { range } from 'lodash';
 import { GlLabel } from '@gitlab/ui';
 import IssueCardInner from '~/boards/components/issue_card_inner.vue';
-import { mockLabelList } from './mock_data';
 import defaultStore from '~/boards/stores';
 import eventHub from '~/boards/eventhub';
 import { updateHistory } from '~/lib/utils/url_utility';
+import { mockLabelList } from './mock_data';
 jest.mock('~/lib/utils/url_utility');
 jest.mock('~/boards/eventhub');

spec/frontend/boards/stores/actions_spec.js

 import testAction from 'helpers/vuex_action_helper';
-import {
-  mockLists,
-  mockListsById,
-  mockIssue,
-  mockIssue2,
-  rawIssue,
-  mockIssues,
-  mockMilestone,
-  labels,
-  mockActiveIssue,
-  mockGroupProjects,
-} from '../mock_data';
 import actions, { gqlClient } from '~/boards/stores/actions';
 import * as types from '~/boards/stores/mutation_types';
 import { inactiveId } from '~/boards/constants';
@@ -25,6 +13,18 @@ import {
   formatIssueInput,
 } from '~/boards/boards_util';
 import createFlash from '~/flash';
+import {
+  mockLists,
+  mockListsById,
+  mockIssue,
+  mockIssue2,
+  rawIssue,
+  mockIssues,
+  mockMilestone,
+  labels,
+  mockActiveIssue,
+  mockGroupProjects,
+} from '../mock_data';
 jest.mock('~/flash');