Merge branch '32486-update-eslint-plugin-import-to-2.18.2-ee-spec-frontend-ph2' into 'master'

Update eslint-plugin-import from 2.16.0 to 2.18.2 (/ee/spec/frontend, 2nd iteration)

See merge request gitlab-org/gitlab!21533

ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js

 import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
 import Vuex from 'vuex';
 import Vue from 'vue';
-import httpStatusCodes from '~/lib/utils/http_status';
 import store from 'ee/analytics/cycle_analytics/store';
 import Component from 'ee/analytics/cycle_analytics/components/base.vue';
 import { GlEmptyState, GlDaterangePicker } from '@gitlab/ui';
@@ -15,6 +14,7 @@ import 'bootstrap';
 import '~/gl_dropdown';
 import Scatterplot from 'ee/analytics/shared/components/scatterplot.vue';
 import waitForPromises from 'helpers/wait_for_promises';
+import httpStatusCodes from '~/lib/utils/http_status';
 import * as mockData from '../mock_data';
 
 const noDataSvgPath = 'path/to/no/data';

ee/spec/frontend/analytics/cycle_analytics/mock_data.js

@@ -2,9 +2,9 @@ import { TEST_HOST } from 'helpers/test_constants';
 import { getJSONFixture } from 'helpers/fixtures';
 import mutations from 'ee/analytics/cycle_analytics/store/mutations';
 import * as types from 'ee/analytics/cycle_analytics/store/mutation_types';
+import { DEFAULT_DAYS_IN_PAST } from 'ee/analytics/cycle_analytics/constants';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { getDateInPast } from '~/lib/utils/datetime_utility';
-import { DEFAULT_DAYS_IN_PAST } from 'ee/analytics/cycle_analytics/constants';
 import { mockLabels } from '../../../../../spec/javascripts/vue_shared/components/sidebar/labels_select/mock_data';
 
 /*

ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js

 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 import testAction from 'helpers/vuex_action_helper';
-import createFlash from '~/flash';
 import * as getters from 'ee/analytics/cycle_analytics/store/getters';
 import * as actions from 'ee/analytics/cycle_analytics/store/actions';
 import * as types from 'ee/analytics/cycle_analytics/store/mutation_types';
+import createFlash from '~/flash';
 import {
   group,
   cycleAnalyticsData,

ee/spec/frontend/dependencies/components/app_spec.js

 import { GlBadge, GlEmptyState, GlLoadingIcon, GlTab, GlLink } from '@gitlab/ui';
 import { createLocalVue, mount } from '@vue/test-utils';
-import { getDateInPast } from '~/lib/utils/datetime_utility';
 import { TEST_HOST } from 'helpers/test_constants';
 import createStore from 'ee/dependencies/store';
 import { addListType } from 'ee/dependencies/store/utils';
@@ -11,6 +10,7 @@ import DependenciesActions from 'ee/dependencies/components/dependencies_actions
 import DependencyListIncompleteAlert from 'ee/dependencies/components/dependency_list_incomplete_alert.vue';
 import DependencyListJobFailedAlert from 'ee/dependencies/components/dependency_list_job_failed_alert.vue';
 import PaginatedDependenciesTable from 'ee/dependencies/components/paginated_dependencies_table.vue';
+import { getDateInPast } from '~/lib/utils/datetime_utility';
 
 describe('DependenciesApp component', () => {
   let store;

ee/spec/frontend/dependencies/store/modules/list/getters_spec.js

-import { getDateInPast } from '~/lib/utils/datetime_utility';
 import { TEST_HOST } from 'helpers/test_constants';
 import * as getters from 'ee/dependencies/store/modules/list/getters';
 import { REPORT_STATUS } from 'ee/dependencies/store/modules/list/constants';
+import { getDateInPast } from '~/lib/utils/datetime_utility';
 
 describe('Dependencies getters', () => {
   describe.each`

ee/spec/frontend/design_management/pages/index_spec.js

 import { createLocalVue, shallowMount } from '@vue/test-utils';
-import createFlash from '~/flash';
 import VueRouter from 'vue-router';
 import Index from 'ee/design_management/pages/index.vue';
 import uploadDesignQuery from 'ee/design_management/graphql/mutations/uploadDesign.mutation.graphql';
 import DesignDestroyer from 'ee/design_management/components/design_destroyer.vue';
+import createFlash from '~/flash';
 
 const localVue = createLocalVue();
 localVue.use(VueRouter);

ee/spec/frontend/epic/mock_data.js

-import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
-
 import { TEST_HOST } from 'spec/test_constants';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
 const metaFixture = getJSONFixture('epic/mock_meta.json');
 const meta = JSON.parse(metaFixture.meta);

ee/spec/frontend/geo_designs/components/geo_design_status_spec.js

 import Vuex from 'vuex';
 import { createLocalVue, mount } from '@vue/test-utils';
-import Icon from '~/vue_shared/components/icon.vue';
 import store from 'ee/geo_designs/store';
 import GeoDesignStatus from 'ee/geo_designs/components/geo_design_status.vue';
 import {
@@ -9,6 +8,7 @@ import {
   STATUS_ICON_CLASS,
   DEFAULT_STATUS,
 } from 'ee/geo_designs/store/constants';
+import Icon from '~/vue_shared/components/icon.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);

ee/spec/frontend/geo_designs/components/geo_design_time_ago_spec.js

 import Vuex from 'vuex';
 import { createLocalVue, mount } from '@vue/test-utils';
-import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import store from 'ee/geo_designs/store';
 import GeoDesignTimeAgo from 'ee/geo_designs/components/geo_design_time_ago.vue';
+import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);

ee/spec/frontend/geo_designs/store/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
 import testAction from 'helpers/vuex_action_helper';
-import axios from '~/lib/utils/axios_utils';
-import flash from '~/flash';
 import * as actions from 'ee/geo_designs/store/actions';
 import * as types from 'ee/geo_designs/store/mutation_types';
 import createState from 'ee/geo_designs/store/state';
+import flash from '~/flash';
+import axios from '~/lib/utils/axios_utils';
 import { MOCK_BASIC_FETCH_DATA_MAP, MOCK_BASIC_FETCH_RESPONSE } from '../mock_data';
 
 jest.mock('~/flash');

ee/spec/frontend/logs/components/environment_logs_spec.js

 import Vue from 'vue';
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import { scrollDown } from '~/lib/utils/scroll_utils';
 import EnvironmentLogs from 'ee/logs/components/environment_logs.vue';
 
 import { createStore } from 'ee/logs/stores';
+import { scrollDown } from '~/lib/utils/scroll_utils';
 import {
   mockProjectPath,
   mockEnvId,

ee/spec/frontend/logs/components/log_control_buttons_spec.js

 import { shallowMount } from '@vue/test-utils';
 import { GlButton } from '@gitlab/ui';
+import LogControlButtons from 'ee/logs/components/log_control_buttons.vue';
 import {
   canScroll,
   isScrolledToTop,
@@ -8,8 +9,6 @@ import {
   scrollUp,
 } from '~/lib/utils/scroll_utils';
 
-import LogControlButtons from 'ee/logs/components/log_control_buttons.vue';
-
 jest.mock('~/lib/utils/scroll_utils');
 
 describe('LogControlButtons', () => {

ee/spec/frontend/logs/stores/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
 
 import testAction from 'helpers/vuex_action_helper';
 import * as types from 'ee/logs/stores/mutation_types';
 import logsPageState from 'ee/logs/stores/state';
 import { setInitData, showPodLogs, fetchEnvironments, fetchLogs } from 'ee/logs/stores/actions';
+import axios from '~/lib/utils/axios_utils';
 
 import flash from '~/flash';
 

ee/spec/frontend/monitoring/alert_widget_spec.js

 import { shallowMount } from '@vue/test-utils';
 import { GlLoadingIcon } from '@gitlab/ui';
-import createFlash from '~/flash';
 import AlertWidget from 'ee/monitoring/components/alert_widget.vue';
 import waitForPromises from 'helpers/wait_for_promises';
+import createFlash from '~/flash';
 
 const mockReadAlert = jest.fn();
 const mockCreateAlert = jest.fn();

ee/spec/frontend/monitoring/panel_type_spec.js

 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import { createStore } from '~/monitoring/stores';
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import PanelType from 'ee/monitoring/components/panel_type.vue';
 import AlertWidget from 'ee/monitoring/components/alert_widget.vue';
+import { createStore } from '~/monitoring/stores';
+import axios from '~/lib/utils/axios_utils';
 import { graphDataPrometheusQueryRange } from '../../../../spec/frontend/monitoring/mock_data';
 
 global.URL.createObjectURL = jest.fn();

ee/spec/frontend/notes/components/note_actions_spec.js

 import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { TEST_HOST } from 'spec/test_constants';
 import createStore from '~/notes/stores';
 import noteActions from '~/notes/components/note_actions.vue';
-import { TEST_HOST } from 'spec/test_constants';
 import { userDataMock } from '../../../../spec/frontend/notes/mock_data';
 
 const localVue = createLocalVue();

ee/spec/frontend/operations/components/dashboard/project_header_spec.js

 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import ProjectHeader from 'ee/operations/components/dashboard/project_header.vue';
-import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
 import { trimText } from 'helpers/text_helper';
+import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
 import { mockOneProject } from '../../mock_data';
 
 const localVue = createLocalVue();

ee/spec/frontend/packages/list/stores/actions_spec.js

 import * as actions from 'ee/packages/list/stores/actions';
 import * as types from 'ee/packages/list/stores/mutation_types';
 import testAction from 'helpers/vuex_action_helper';
-import createFlash from '~/flash';
 import Api from 'ee/api';
+import createFlash from '~/flash';
 
 jest.mock('~/flash.js');
 jest.mock('ee/api.js');

ee/spec/frontend/packages/list/stores/mutations_spec.js

-import * as commonUtils from '~/lib/utils/common_utils';
 import mutations from 'ee/packages/list/stores/mutations';
 import * as types from 'ee/packages/list/stores/mutation_types';
 import createState from 'ee/packages/list/stores/state';
+import * as commonUtils from '~/lib/utils/common_utils';
 import { npmPackage, mavenPackage } from '../../mock_data';
 
 describe('Mutations Registry Store', () => {

ee/spec/frontend/project_licenses/store/modules/list/actions_spec.js

@@ -6,9 +6,9 @@ import * as actions from 'ee/project_licenses/store/modules/list/actions';
 import * as types from 'ee/project_licenses/store/modules/list/mutation_types';
 import getInitialState from 'ee/project_licenses/store/modules/list/state';
 
+import { FETCH_ERROR_MESSAGE } from 'ee/project_licenses/store/modules/list/constants';
 import createFlash from '~/flash';
 
-import { FETCH_ERROR_MESSAGE } from 'ee/project_licenses/store/modules/list/constants';
 import mockLicensesResponse from './data/mock_licenses';
 
 jest.mock('~/flash', () => jest.fn());

ee/spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js

 import { shallowMount, mount } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import httpStatusCodes from '~/lib/utils/http_status';
 import waitForPromises from 'helpers/wait_for_promises';
 import ServiceDeskRoot from 'ee/projects/settings_service_desk/components/service_desk_root.vue';
+import axios from '~/lib/utils/axios_utils';
+import httpStatusCodes from '~/lib/utils/http_status';
 
 describe('ServiceDeskRoot', () => {
   const endpoint = '/gitlab-org/gitlab-test/service_desk';

ee/spec/frontend/projects/settings_service_desk/services/service_desk_service_spec.js

 import AxiosMockAdapter from 'axios-mock-adapter';
+import ServiceDeskService from 'ee/projects/settings_service_desk/services/service_desk_service';
 import axios from '~/lib/utils/axios_utils';
 import httpStatusCodes from '~/lib/utils/http_status';
-import ServiceDeskService from 'ee/projects/settings_service_desk/services/service_desk_service';
 
 describe('ServiceDeskService', () => {
   const endpoint = `/gitlab-org/gitlab-test/service_desk`;

ee/spec/frontend/protected_branches/protected_branch_edit_spec.js

 import $ from 'jquery';
 import MockAdapter from 'axios-mock-adapter';
 import ProtectedBranchEdit from 'ee/protected_branches/protected_branch_edit';
+import { TEST_HOST } from 'helpers/test_constants';
 import flash from '~/flash';
 import axios from '~/lib/utils/axios_utils';
-import { TEST_HOST } from 'helpers/test_constants';
 
 jest.mock('~/flash');
 

ee/spec/frontend/related_items_tree/components/related_items_tree_header_spec.js

@@ -2,11 +2,11 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlButton } from '@gitlab/ui';
 
 import RelatedItemsTreeHeader from 'ee/related_items_tree/components/related_items_tree_header.vue';
-import Icon from '~/vue_shared/components/icon.vue';
 import createDefaultStore from 'ee/related_items_tree/store';
 import * as epicUtils from 'ee/related_items_tree/utils/epic_utils';
 import { issuableTypesMap } from 'ee/related_issues/constants';
 import EpicActionsSplitButton from 'ee/related_items_tree/components/epic_actions_split_button.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 
 import {
   mockParentItem,

ee/spec/frontend/related_items_tree/components/tree_item_body_spec.js

 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { GlButton, GlLink } from '@gitlab/ui';
 
-import Icon from '~/vue_shared/components/icon.vue';
-import ItemMilestone from '~/vue_shared/components/issue/issue_milestone.vue';
-import ItemDueDate from '~/boards/components/issue_due_date.vue';
 import ItemWeight from 'ee/boards/components/issue_card_weight.vue';
-import ItemAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
 
 import TreeItemBody from 'ee/related_items_tree/components/tree_item_body.vue';
 import StateTooltip from 'ee/related_items_tree/components/state_tooltip.vue';
@@ -14,6 +10,10 @@ import createDefaultStore from 'ee/related_items_tree/store';
 import * as epicUtils from 'ee/related_items_tree/utils/epic_utils';
 import { ChildType, ChildState } from 'ee/related_items_tree/constants';
 import { PathIdSeparator } from 'ee/related_issues/constants';
+import ItemAssignees from '~/vue_shared/components/issue/issue_assignees.vue';
+import ItemDueDate from '~/boards/components/issue_due_date.vue';
+import ItemMilestone from '~/vue_shared/components/issue/issue_milestone.vue';
+import Icon from '~/vue_shared/components/icon.vue';
 
 import {
   mockParentItem,

ee/spec/frontend/security_dashboard/components/project_list_spec.js

 import { shallowMount, createLocalVue } from '@vue/test-utils';
 
 import { GlBadge, GlButton, GlLoadingIcon } from '@gitlab/ui';
-import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
-
 import ProjectList from 'ee/security_dashboard/components/project_list.vue';
+import ProjectAvatar from '~/vue_shared/components/project_avatar/default.vue';
 
 const localVue = createLocalVue();
 

ee/spec/frontend/security_dashboard/components/project_manager_spec.js

@@ -5,9 +5,9 @@ import createDefaultState from 'ee/security_dashboard/store/modules/project_sele
 
 import { GlButton } from '@gitlab/ui';
 
-import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';
 import ProjectManager from 'ee/security_dashboard/components/project_manager.vue';
 import ProjectList from 'ee/security_dashboard/components/project_list.vue';
+import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);

ee/spec/frontend/security_dashboard/store/modules/project_selector/actions_spec.js

 import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
 import testAction from 'helpers/vuex_action_helper';
 
-import Api from '~/api';
-import createFlash from '~/flash';
-
 import createState from 'ee/security_dashboard/store/modules/project_selector/state';
 import * as types from 'ee/security_dashboard/store/modules/project_selector/mutation_types';
 import * as actions from 'ee/security_dashboard/store/modules/project_selector/actions';
+import createFlash from '~/flash';
+import Api from '~/api';
+import axios from '~/lib/utils/axios_utils';
 
 jest.mock('~/api');
 jest.mock('~/flash');

ee/spec/frontend/vue_mr_widget/components/visual_review_app_spec.js

 import { shallowMount, mount, createLocalVue } from '@vue/test-utils';
 import VisualReviewAppLink from 'ee/vue_merge_request_widget/components/visual_review_app_link.vue';
 import { GlButton, GlModal } from '@gitlab/ui';
-import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 import { mockTracking, triggerEvent } from 'helpers/tracking_helper';
+import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 
 const localVue = createLocalVue();