diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /spec/frontend | |
parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
75 files changed, 86 insertions, 89 deletions
diff --git a/spec/frontend/monitoring/charts/time_series_spec.js b/spec/frontend/monitoring/charts/time_series_spec.js index 6fa2d15ccbf..efc2da40a52 100644 --- a/spec/frontend/monitoring/charts/time_series_spec.js +++ b/spec/frontend/monitoring/charts/time_series_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import { setTestTimeout } from 'helpers/timeout'; -import { createStore } from '~/monitoring/stores'; import { GlLink } from '@gitlab/ui'; import { GlAreaChart, GlLineChart, GlChartSeriesLabel } from '@gitlab/ui/dist/charts'; import { shallowWrapperContainsSlotText } from 'helpers/vue_test_utils_helper'; +import { createStore } from '~/monitoring/stores'; import TimeSeries from '~/monitoring/components/charts/time_series.vue'; import * as types from '~/monitoring/stores/mutation_types'; import { diff --git a/spec/frontend/monitoring/components/charts/anomaly_spec.js b/spec/frontend/monitoring/components/charts/anomaly_spec.js index 38aef6e6052..7446461a574 100644 --- a/spec/frontend/monitoring/components/charts/anomaly_spec.js +++ b/spec/frontend/monitoring/components/charts/anomaly_spec.js @@ -1,6 +1,7 @@ +import { shallowMount } from '@vue/test-utils'; +import { TEST_HOST } from 'helpers/test_constants'; import Anomaly from '~/monitoring/components/charts/anomaly.vue'; -import { shallowMount } from '@vue/test-utils'; import { colorValues } from '~/monitoring/constants'; import { anomalyDeploymentData, @@ -8,7 +9,6 @@ import { anomalyMockGraphData, anomalyMockResultValues, } from '../../mock_data'; -import { TEST_HOST } from 'helpers/test_constants'; import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; const mockWidgets = 'mockWidgets'; diff --git a/spec/frontend/monitoring/embed/embed_spec.js b/spec/frontend/monitoring/embed/embed_spec.js index 6d40719fa32..15ea7c63875 100644 --- a/spec/frontend/monitoring/embed/embed_spec.js +++ b/spec/frontend/monitoring/embed/embed_spec.js @@ -1,8 +1,8 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import Embed from '~/monitoring/components/embed.vue'; import PanelType from 'ee_else_ce/monitoring/components/panel_type.vue'; import { TEST_HOST } from 'helpers/test_constants'; +import Embed from '~/monitoring/components/embed.vue'; import { groups, initialState, metricsData, metricsWithData } from './mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js index 83dac6552a2..9ee8e4e9144 100644 --- a/spec/frontend/monitoring/store/actions_spec.js +++ b/spec/frontend/monitoring/store/actions_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import Tracking from '~/tracking'; import testAction from 'helpers/vuex_action_helper'; +import Tracking from '~/tracking'; import axios from '~/lib/utils/axios_utils'; import statusCodes from '~/lib/utils/http_status'; import { backOff } from '~/lib/utils/common_utils'; diff --git a/spec/frontend/mr_popover/mr_popover_spec.js b/spec/frontend/mr_popover/mr_popover_spec.js index 79ed4163010..e72b729f056 100644 --- a/spec/frontend/mr_popover/mr_popover_spec.js +++ b/spec/frontend/mr_popover/mr_popover_spec.js @@ -1,5 +1,5 @@ -import MRPopover from '~/mr_popover/components/mr_popover'; import { shallowMount } from '@vue/test-utils'; +import MRPopover from '~/mr_popover/components/mr_popover'; describe('MR Popover', () => { let wrapper; diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js index 475ea4f0f7d..10d92e9535c 100644 --- a/spec/frontend/notes/components/comment_form_spec.js +++ b/spec/frontend/notes/components/comment_form_spec.js @@ -2,12 +2,12 @@ import $ from 'jquery'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import Autosize from 'autosize'; +import { trimText } from 'helpers/text_helper'; import axios from '~/lib/utils/axios_utils'; import createStore from '~/notes/stores'; import CommentForm from '~/notes/components/comment_form.vue'; import * as constants from '~/notes/constants'; import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import { trimText } from 'helpers/text_helper'; import { keyboardDownEvent } from '../../issue_show/helpers'; import { loggedOutnoteableData, diff --git a/spec/frontend/notes/components/discussion_actions_spec.js b/spec/frontend/notes/components/discussion_actions_spec.js index 3ccfea121b0..6198f8b3c1d 100644 --- a/spec/frontend/notes/components/discussion_actions_spec.js +++ b/spec/frontend/notes/components/discussion_actions_spec.js @@ -1,4 +1,3 @@ -import createStore from '~/notes/stores'; import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; import { discussionMock } from '../../notes/mock_data'; import DiscussionActions from '~/notes/components/discussion_actions.vue'; @@ -6,6 +5,7 @@ import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vu import ResolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue'; import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue'; import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue'; +import createStore from '~/notes/stores'; // NOTE: clone mock_data so that it is not accidentally mutated const createDiscussionMock = (props = {}) => diff --git a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js index ed173eacfab..3986340b6fd 100644 --- a/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js +++ b/spec/frontend/notes/components/discussion_jump_to_next_button_spec.js @@ -1,5 +1,5 @@ -import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue'; import { shallowMount } from '@vue/test-utils'; +import JumpToNextDiscussionButton from '~/notes/components/discussion_jump_to_next_button.vue'; describe('JumpToNextDiscussionButton', () => { let wrapper; diff --git a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js index e008f4ed093..3152b6ff241 100644 --- a/spec/frontend/notes/components/discussion_reply_placeholder_spec.js +++ b/spec/frontend/notes/components/discussion_reply_placeholder_spec.js @@ -1,5 +1,5 @@ -import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; const localVue = createLocalVue(); const buttonText = 'Test Button Text'; diff --git a/spec/frontend/notes/components/discussion_resolve_button_spec.js b/spec/frontend/notes/components/discussion_resolve_button_spec.js index 5024f40ec5d..1fae19f4492 100644 --- a/spec/frontend/notes/components/discussion_resolve_button_spec.js +++ b/spec/frontend/notes/components/discussion_resolve_button_spec.js @@ -1,5 +1,5 @@ -import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue'; const buttonTitle = 'Resolve discussion'; diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js index 96133c601aa..c1c9d5cef4a 100644 --- a/spec/frontend/notes/old_notes_spec.js +++ b/spec/frontend/notes/old_notes_spec.js @@ -3,12 +3,12 @@ import $ from 'jquery'; import _ from 'underscore'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; -import * as urlUtility from '~/lib/utils/url_utility'; import '~/behaviors/markdown/render_gfm'; import { createSpyObj } from 'helpers/jest_helpers'; import { setTestTimeoutOnce } from 'helpers/timeout'; import { TEST_HOST } from 'helpers/test_constants'; +import * as urlUtility from '~/lib/utils/url_utility'; +import axios from '~/lib/utils/axios_utils'; // These must be imported synchronously because they pull dependencies // from the DOM. diff --git a/spec/frontend/operation_settings/components/external_dashboard_spec.js b/spec/frontend/operation_settings/components/external_dashboard_spec.js index 39d7c19e731..bb6e029c808 100644 --- a/spec/frontend/operation_settings/components/external_dashboard_spec.js +++ b/spec/frontend/operation_settings/components/external_dashboard_spec.js @@ -1,11 +1,11 @@ import { mount, shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton, GlLink, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { TEST_HOST } from 'helpers/test_constants'; import ExternalDashboard from '~/operation_settings/components/external_dashboard.vue'; import store from '~/operation_settings/store'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; import createFlash from '~/flash'; -import { TEST_HOST } from 'helpers/test_constants'; jest.mock('~/lib/utils/url_utility'); jest.mock('~/flash'); diff --git a/spec/frontend/pages/profiles/show/emoji_menu_spec.js b/spec/frontend/pages/profiles/show/emoji_menu_spec.js index 6ac1e83829f..00320fb4601 100644 --- a/spec/frontend/pages/profiles/show/emoji_menu_spec.js +++ b/spec/frontend/pages/profiles/show/emoji_menu_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; +import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; import EmojiMenu from '~/pages/profiles/show/emoji_menu'; -import { TEST_HOST } from 'helpers/test_constants'; describe('EmojiMenu', () => { const dummyEmojiTag = '<dummy></tag>'; diff --git a/spec/frontend/performance_bar/components/add_request_spec.js b/spec/frontend/performance_bar/components/add_request_spec.js index cef264f3915..a0ad25744b0 100644 --- a/spec/frontend/performance_bar/components/add_request_spec.js +++ b/spec/frontend/performance_bar/components/add_request_spec.js @@ -1,5 +1,5 @@ -import AddRequest from '~/performance_bar/components/add_request.vue'; import { shallowMount } from '@vue/test-utils'; +import AddRequest from '~/performance_bar/components/add_request.vue'; describe('add request form', () => { let wrapper; diff --git a/spec/frontend/performance_bar/components/detailed_metric_spec.js b/spec/frontend/performance_bar/components/detailed_metric_spec.js index 74f242431a1..01b6b7b043c 100644 --- a/spec/frontend/performance_bar/components/detailed_metric_spec.js +++ b/spec/frontend/performance_bar/components/detailed_metric_spec.js @@ -1,6 +1,6 @@ +import { shallowMount } from '@vue/test-utils'; import DetailedMetric from '~/performance_bar/components/detailed_metric.vue'; import RequestWarning from '~/performance_bar/components/request_warning.vue'; -import { shallowMount } from '@vue/test-utils'; describe('detailedMetric', () => { const createComponent = props => diff --git a/spec/frontend/performance_bar/components/performance_bar_app_spec.js b/spec/frontend/performance_bar/components/performance_bar_app_spec.js index ba403dd6209..417a655093c 100644 --- a/spec/frontend/performance_bar/components/performance_bar_app_spec.js +++ b/spec/frontend/performance_bar/components/performance_bar_app_spec.js @@ -1,6 +1,6 @@ +import { shallowMount } from '@vue/test-utils'; import PerformanceBarApp from '~/performance_bar/components/performance_bar_app.vue'; import PerformanceBarStore from '~/performance_bar/stores/performance_bar_store'; -import { shallowMount } from '@vue/test-utils'; describe('performance bar app', () => { const store = new PerformanceBarStore(); diff --git a/spec/frontend/performance_bar/components/request_selector_spec.js b/spec/frontend/performance_bar/components/request_selector_spec.js index 42ccb1f1b5c..871f0485a13 100644 --- a/spec/frontend/performance_bar/components/request_selector_spec.js +++ b/spec/frontend/performance_bar/components/request_selector_spec.js @@ -1,5 +1,5 @@ -import RequestSelector from '~/performance_bar/components/request_selector.vue'; import { shallowMount } from '@vue/test-utils'; +import RequestSelector from '~/performance_bar/components/request_selector.vue'; describe('request selector', () => { const requests = [ diff --git a/spec/frontend/performance_bar/components/request_warning_spec.js b/spec/frontend/performance_bar/components/request_warning_spec.js index 6d8bfba56f6..21f7bdf01f3 100644 --- a/spec/frontend/performance_bar/components/request_warning_spec.js +++ b/spec/frontend/performance_bar/components/request_warning_spec.js @@ -1,5 +1,5 @@ -import RequestWarning from '~/performance_bar/components/request_warning.vue'; import { shallowMount } from '@vue/test-utils'; +import RequestWarning from '~/performance_bar/components/request_warning.vue'; describe('request warning', () => { const htmlId = 'request-123'; diff --git a/spec/frontend/pipelines/graph/job_item_spec.js b/spec/frontend/pipelines/graph/job_item_spec.js index 943ef9d3531..c79af95b3f3 100644 --- a/spec/frontend/pipelines/graph/job_item_spec.js +++ b/spec/frontend/pipelines/graph/job_item_spec.js @@ -1,5 +1,5 @@ -import { trimText } from 'helpers/text_helper'; import { mount } from '@vue/test-utils'; +import { trimText } from 'helpers/text_helper'; import JobItem from '~/pipelines/components/graph/job_item.vue'; describe('pipeline graph job item', () => { diff --git a/spec/frontend/pipelines/test_reports/stores/actions_spec.js b/spec/frontend/pipelines/test_reports/stores/actions_spec.js index d7007eb7631..56148361e0a 100644 --- a/spec/frontend/pipelines/test_reports/stores/actions_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/actions_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; +import { getJSONFixture } from 'helpers/fixtures'; import axios from '~/lib/utils/axios_utils'; import * as actions from '~/pipelines/stores/test_reports/actions'; import * as types from '~/pipelines/stores/test_reports/mutation_types'; -import { getJSONFixture } from 'helpers/fixtures'; import { TEST_HOST } from '../../../helpers/test_constants'; import testAction from '../../../helpers/vuex_action_helper'; import createFlash from '~/flash'; diff --git a/spec/frontend/pipelines/test_reports/stores/getters_spec.js b/spec/frontend/pipelines/test_reports/stores/getters_spec.js index cfd0ecdcb30..011a7e68908 100644 --- a/spec/frontend/pipelines/test_reports/stores/getters_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/getters_spec.js @@ -1,6 +1,6 @@ +import { getJSONFixture } from 'helpers/fixtures'; import * as getters from '~/pipelines/stores/test_reports/getters'; import { iconForTestStatus } from '~/pipelines/stores/test_reports/utils'; -import { getJSONFixture } from 'helpers/fixtures'; describe('Getters TestReports Store', () => { let state; diff --git a/spec/frontend/pipelines/test_reports/stores/mutations_spec.js b/spec/frontend/pipelines/test_reports/stores/mutations_spec.js index b891415f705..9eaa563025d 100644 --- a/spec/frontend/pipelines/test_reports/stores/mutations_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/mutations_spec.js @@ -1,6 +1,6 @@ +import { getJSONFixture } from 'helpers/fixtures'; import * as types from '~/pipelines/stores/test_reports/mutation_types'; import mutations from '~/pipelines/stores/test_reports/mutations'; -import { getJSONFixture } from 'helpers/fixtures'; describe('Mutations TestReports Store', () => { let mockState; diff --git a/spec/frontend/pipelines/test_reports/test_reports_spec.js b/spec/frontend/pipelines/test_reports/test_reports_spec.js index 033c3300098..cc86ba6d46d 100644 --- a/spec/frontend/pipelines/test_reports/test_reports_spec.js +++ b/spec/frontend/pipelines/test_reports/test_reports_spec.js @@ -1,8 +1,8 @@ import Vuex from 'vuex'; -import TestReports from '~/pipelines/components/test_reports/test_reports.vue'; import { shallowMount } from '@vue/test-utils'; -import * as actions from '~/pipelines/stores/test_reports/actions'; import { getJSONFixture } from 'helpers/fixtures'; +import TestReports from '~/pipelines/components/test_reports/test_reports.vue'; +import * as actions from '~/pipelines/stores/test_reports/actions'; describe('Test reports app', () => { let wrapper; diff --git a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js index bc5d8647d6a..a5b093cf769 100644 --- a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js @@ -1,9 +1,9 @@ import Vuex from 'vuex'; +import { shallowMount } from '@vue/test-utils'; +import { getJSONFixture } from 'helpers/fixtures'; import SuiteTable from '~/pipelines/components/test_reports/test_suite_table.vue'; import * as getters from '~/pipelines/stores/test_reports/getters'; import { TestStatus } from '~/pipelines/constants'; -import { shallowMount } from '@vue/test-utils'; -import { getJSONFixture } from 'helpers/fixtures'; import skippedTestCases from './mock_data'; describe('Test reports suite table', () => { diff --git a/spec/frontend/pipelines/test_reports/test_summary_spec.js b/spec/frontend/pipelines/test_reports/test_summary_spec.js index 2c1a30f0fd5..160d93d2e6b 100644 --- a/spec/frontend/pipelines/test_reports/test_summary_spec.js +++ b/spec/frontend/pipelines/test_reports/test_summary_spec.js @@ -1,6 +1,6 @@ -import Summary from '~/pipelines/components/test_reports/test_summary.vue'; import { mount } from '@vue/test-utils'; import { getJSONFixture } from 'helpers/fixtures'; +import Summary from '~/pipelines/components/test_reports/test_summary.vue'; describe('Test reports summary', () => { let wrapper; diff --git a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js index 7d06d96fe75..9146f301f66 100644 --- a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js @@ -1,8 +1,8 @@ import Vuex from 'vuex'; -import SummaryTable from '~/pipelines/components/test_reports/test_summary_table.vue'; -import * as getters from '~/pipelines/stores/test_reports/getters'; import { mount, createLocalVue } from '@vue/test-utils'; import { getJSONFixture } from 'helpers/fixtures'; +import SummaryTable from '~/pipelines/components/test_reports/test_summary_table.vue'; +import * as getters from '~/pipelines/stores/test_reports/getters'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/project_find_file_spec.js b/spec/frontend/project_find_file_spec.js index e60f9f62747..b697ca01046 100644 --- a/spec/frontend/project_find_file_spec.js +++ b/spec/frontend/project_find_file_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import $ from 'jquery'; -import ProjectFindFile from '~/project_find_file'; -import axios from '~/lib/utils/axios_utils'; import { TEST_HOST } from 'helpers/test_constants'; import sanitize from 'sanitize-html'; +import ProjectFindFile from '~/project_find_file'; +import axios from '~/lib/utils/axios_utils'; jest.mock('sanitize-html', () => jest.fn(val => val)); diff --git a/spec/frontend/registry/list/components/app_spec.js b/spec/frontend/registry/list/components/app_spec.js index 0013b27bd01..f2733ac9fef 100644 --- a/spec/frontend/registry/list/components/app_spec.js +++ b/spec/frontend/registry/list/components/app_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { mount } from '@vue/test-utils'; -import registry from '~/registry/list/components/app.vue'; import { TEST_HOST } from 'helpers/test_constants'; +import registry from '~/registry/list/components/app.vue'; import { reposServerResponse, parsedReposServerResponse } from '../mock_data'; describe('Registry List', () => { diff --git a/spec/frontend/registry/list/stores/actions_spec.js b/spec/frontend/registry/list/stores/actions_spec.js index 1a9c23ed188..2fc363e9a4f 100644 --- a/spec/frontend/registry/list/stores/actions_spec.js +++ b/spec/frontend/registry/list/stores/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; +import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; import axios from '~/lib/utils/axios_utils'; import * as actions from '~/registry/list/stores/actions'; import * as types from '~/registry/list/stores/mutation_types'; -import { TEST_HOST } from 'helpers/test_constants'; -import testAction from 'helpers/vuex_action_helper'; import createFlash from '~/flash'; import { diff --git a/spec/frontend/registry/settings/stores/actions_spec.js b/spec/frontend/registry/settings/stores/actions_spec.js index 205c3a6ee21..484f1b2dc0a 100644 --- a/spec/frontend/registry/settings/stores/actions_spec.js +++ b/spec/frontend/registry/settings/stores/actions_spec.js @@ -1,6 +1,6 @@ +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/registry/settings/stores/actions'; import * as types from '~/registry/settings/stores/mutation_types'; -import testAction from 'helpers/vuex_action_helper'; jest.mock('~/flash.js'); diff --git a/spec/frontend/releases/detail/store/actions_spec.js b/spec/frontend/releases/detail/store/actions_spec.js index f1c7f3c1048..5a1447aa4fc 100644 --- a/spec/frontend/releases/detail/store/actions_spec.js +++ b/spec/frontend/releases/detail/store/actions_spec.js @@ -1,7 +1,7 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import * as actions from '~/releases/detail/store/actions'; import testAction from 'helpers/vuex_action_helper'; +import * as actions from '~/releases/detail/store/actions'; import * as types from '~/releases/detail/store/mutation_types'; import { release } from '../../mock_data'; import state from '~/releases/detail/store/state'; diff --git a/spec/frontend/releases/list/components/release_block_footer_spec.js b/spec/frontend/releases/list/components/release_block_footer_spec.js index 172147f1cc8..36a94b21df1 100644 --- a/spec/frontend/releases/list/components/release_block_footer_spec.js +++ b/spec/frontend/releases/list/components/release_block_footer_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; -import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue'; -import Icon from '~/vue_shared/components/icon.vue'; import { GlLink } from '@gitlab/ui'; import { trimText } from 'helpers/text_helper'; +import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue'; +import Icon from '~/vue_shared/components/icon.vue'; import { release } from '../../mock_data'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; diff --git a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js index c7d1bc3c372..7179ab3d3cc 100644 --- a/spec/frontend/releases/list/components/release_block_milestone_info_spec.js +++ b/spec/frontend/releases/list/components/release_block_milestone_info_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; import { GlProgressBar, GlLink, GlBadge, GlButton } from '@gitlab/ui'; +import { trimText } from 'helpers/text_helper'; import ReleaseBlockMilestoneInfo from '~/releases/list/components/release_block_milestone_info.vue'; import { milestones } from '../../mock_data'; -import { trimText } from 'helpers/text_helper'; import { MAX_MILESTONES_TO_DISPLAY } from '~/releases/list/constants'; describe('Release block milestone info', () => { diff --git a/spec/frontend/releases/list/components/release_block_spec.js b/spec/frontend/releases/list/components/release_block_spec.js index c7a1cbdea17..c83af01f6e0 100644 --- a/spec/frontend/releases/list/components/release_block_spec.js +++ b/spec/frontend/releases/list/components/release_block_spec.js @@ -1,9 +1,9 @@ import { mount } from '@vue/test-utils'; +import { first } from 'underscore'; import EvidenceBlock from '~/releases/list/components/evidence_block.vue'; import ReleaseBlock from '~/releases/list/components/release_block.vue'; import ReleaseBlockFooter from '~/releases/list/components/release_block_footer.vue'; import timeagoMixin from '~/vue_shared/mixins/timeago'; -import { first } from 'underscore'; import { release } from '../../mock_data'; import Icon from '~/vue_shared/components/icon.vue'; import { scrollToElement } from '~/lib/utils/common_utils'; diff --git a/spec/frontend/reports/components/report_section_spec.js b/spec/frontend/reports/components/report_section_spec.js index d4a3073374a..eaeb074acaf 100644 --- a/spec/frontend/reports/components/report_section_spec.js +++ b/spec/frontend/reports/components/report_section_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import reportSection from '~/reports/components/report_section.vue'; import mountComponent, { mountComponentWithSlots } from 'helpers/vue_mount_component_helper'; +import reportSection from '~/reports/components/report_section.vue'; describe('Report section', () => { let vm; diff --git a/spec/frontend/serverless/components/environment_row_spec.js b/spec/frontend/serverless/components/environment_row_spec.js index 0ad85e218dc..866b2165917 100644 --- a/spec/frontend/serverless/components/environment_row_spec.js +++ b/spec/frontend/serverless/components/environment_row_spec.js @@ -1,5 +1,5 @@ -import environmentRowComponent from '~/serverless/components/environment_row.vue'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import environmentRowComponent from '~/serverless/components/environment_row.vue'; import { mockServerlessFunctions, mockServerlessFunctionsDiffEnv } from '../mock_data'; import { translate } from '~/serverless/utils'; diff --git a/spec/frontend/serverless/components/function_details_spec.js b/spec/frontend/serverless/components/function_details_spec.js index 31348ff1194..27d3a43db27 100644 --- a/spec/frontend/serverless/components/function_details_spec.js +++ b/spec/frontend/serverless/components/function_details_spec.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import functionDetailsComponent from '~/serverless/components/function_details.vue'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import functionDetailsComponent from '~/serverless/components/function_details.vue'; import { createStore } from '~/serverless/store'; describe('functionDetailsComponent', () => { diff --git a/spec/frontend/serverless/components/function_row_spec.js b/spec/frontend/serverless/components/function_row_spec.js index 979f98c4832..559c55a1eb4 100644 --- a/spec/frontend/serverless/components/function_row_spec.js +++ b/spec/frontend/serverless/components/function_row_spec.js @@ -1,5 +1,5 @@ -import functionRowComponent from '~/serverless/components/function_row.vue'; import { shallowMount } from '@vue/test-utils'; +import functionRowComponent from '~/serverless/components/function_row.vue'; import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { mockServerlessFunction } from '../mock_data'; diff --git a/spec/frontend/serverless/components/functions_spec.js b/spec/frontend/serverless/components/functions_spec.js index d8a80f8031e..29d35b5f1a6 100644 --- a/spec/frontend/serverless/components/functions_spec.js +++ b/spec/frontend/serverless/components/functions_spec.js @@ -1,13 +1,13 @@ import Vuex from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; import AxiosMockAdapter from 'axios-mock-adapter'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; import functionsComponent from '~/serverless/components/functions.vue'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { createStore } from '~/serverless/store'; import EmptyState from '~/serverless/components/empty_state.vue'; import EnvironmentRow from '~/serverless/components/environment_row.vue'; -import { TEST_HOST } from 'helpers/test_constants'; import { mockServerlessFunctions } from '../mock_data'; describe('functionsComponent', () => { diff --git a/spec/frontend/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js index 5dbdccde2de..908f534b847 100644 --- a/spec/frontend/serverless/components/missing_prometheus_spec.js +++ b/spec/frontend/serverless/components/missing_prometheus_spec.js @@ -1,6 +1,6 @@ import { GlButton } from '@gitlab/ui'; -import missingPrometheusComponent from '~/serverless/components/missing_prometheus.vue'; import { shallowMount } from '@vue/test-utils'; +import missingPrometheusComponent from '~/serverless/components/missing_prometheus.vue'; const createComponent = missingData => shallowMount(missingPrometheusComponent, { diff --git a/spec/frontend/serverless/components/pod_box_spec.js b/spec/frontend/serverless/components/pod_box_spec.js index d82825d8f62..8563d29c56b 100644 --- a/spec/frontend/serverless/components/pod_box_spec.js +++ b/spec/frontend/serverless/components/pod_box_spec.js @@ -1,5 +1,5 @@ -import podBoxComponent from '~/serverless/components/pod_box.vue'; import { shallowMount } from '@vue/test-utils'; +import podBoxComponent from '~/serverless/components/pod_box.vue'; const createComponent = count => shallowMount(podBoxComponent, { diff --git a/spec/frontend/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js index 706441e8a8b..9b15df20a89 100644 --- a/spec/frontend/serverless/components/url_spec.js +++ b/spec/frontend/serverless/components/url_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import urlComponent from '~/serverless/components/url.vue'; import { shallowMount } from '@vue/test-utils'; +import urlComponent from '~/serverless/components/url.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; const createComponent = uri => diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js index d0d1af56872..d800649bc1d 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import { joinPaths } from '~/lib/utils/url_utility'; import { TEST_HOST } from 'helpers/test_constants'; +import { joinPaths } from '~/lib/utils/url_utility'; import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import userDataMock from '../../user_data_mock'; diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js index d60ae17733b..e925da0e4c2 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import { TEST_HOST } from 'helpers/test_constants'; +import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import userDataMock from '../../user_data_mock'; const TEST_AVATAR = `${TEST_HOST}/avatar.png`; diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js index c88ae196875..6aa7b166804 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; +import UsersMockHelper from 'helpers/user_mock_data_helper'; import CollapsedAssigneeList from '~/sidebar/components/assignees/collapsed_assignee_list.vue'; import CollapsedAssignee from '~/sidebar/components/assignees/collapsed_assignee.vue'; -import UsersMockHelper from 'helpers/user_mock_data_helper'; const DEFAULT_MAX_COUNTER = 99; diff --git a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js index 1de21f30d21..8381cc25db4 100644 --- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; +import { TEST_HOST } from 'helpers/test_constants'; import UncollapsedAssigneeList from '~/sidebar/components/assignees/uncollapsed_assignee_list.vue'; import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; -import { TEST_HOST } from 'helpers/test_constants'; import userDataMock from '../../user_data_mock'; import UsersMockHelper from '../../../helpers/user_mock_data_helper'; diff --git a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js index 1ec5a94ba68..68dde14880a 100644 --- a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js +++ b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import ConfidentialIssueSidebar from '~/sidebar/components/confidential/confidential_issue_sidebar.vue'; import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; +import ConfidentialIssueSidebar from '~/sidebar/components/confidential/confidential_issue_sidebar.vue'; import EditForm from '~/sidebar/components/confidential/edit_form.vue'; import SidebarService from '~/sidebar/services/sidebar_service'; import createFlash from '~/flash'; diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index 0b9cfa44409..b39b7375d80 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import * as jqueryMatchers from 'custom-jquery-matchers'; import $ from 'jquery'; -import Translate from '~/vue_shared/translate'; import { config as testUtilsConfig } from '@vue/test-utils'; +import Translate from '~/vue_shared/translate'; import { initializeTestTimeout } from './helpers/timeout'; import { getJSONFixture, loadHTMLFixture, setHTMLFixture } from './helpers/fixtures'; import { setupManualMocks } from './mocks/mocks_helper'; diff --git a/spec/frontend/transfer_edit_spec.js b/spec/frontend/transfer_edit_spec.js index 3a1ede49068..dc9455a569d 100644 --- a/spec/frontend/transfer_edit_spec.js +++ b/spec/frontend/transfer_edit_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import setupTransferEdit from '~/transfer_edit'; import { loadHTMLFixture } from 'helpers/fixtures'; +import setupTransferEdit from '~/transfer_edit'; describe('setupTransferEdit', () => { const formSelector = '.js-project-transfer-form'; diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js index 7d593a77bf3..f979d173eff 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js @@ -1,9 +1,9 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import { GlLoadingIcon } from '@gitlab/ui'; import { TEST_HOST } from 'helpers/test_constants'; +import axios from '~/lib/utils/axios_utils'; import ArtifactsListApp from '~/vue_merge_request_widget/components/artifacts_list_app.vue'; import createStore from '~/vue_merge_request_widget/stores/artifacts_list'; import { artifactsList } from './mock_data'; diff --git a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js index ee107f297ef..5f101ba4cf6 100644 --- a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_collapsible_extension.vue'; import { GlLoadingIcon } from '@gitlab/ui'; +import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_collapsible_extension.vue'; describe('Merge Request Collapsible Extension', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/content_viewer/viewers/image_viewer_spec.js b/spec/frontend/vue_shared/components/content_viewer/viewers/image_viewer_spec.js index 3ad8f3aec7c..ef785b9f0f5 100644 --- a/spec/frontend/vue_shared/components/content_viewer/viewers/image_viewer_spec.js +++ b/spec/frontend/vue_shared/components/content_viewer/viewers/image_viewer_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import ImageViewer from '~/vue_shared/components/content_viewer/viewers/image_viewer.vue'; import { GREEN_BOX_IMAGE_URL } from 'spec/test_constants'; +import ImageViewer from '~/vue_shared/components/content_viewer/viewers/image_viewer.vue'; describe('Image Viewer', () => { const requiredProps = { diff --git a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js index f076c45e56c..d9badffb50d 100644 --- a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js +++ b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js @@ -1,7 +1,7 @@ import Vuex from 'vuex'; -import GlToggleVuex from '~/vue_shared/components/gl_toggle_vuex.vue'; import { GlToggle } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; +import GlToggleVuex from '~/vue_shared/components/gl_toggle_vuex.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/vue_shared/components/issue/issue_warning_spec.js b/spec/frontend/vue_shared/components/issue/issue_warning_spec.js index 63880b85625..7bb054b4e6c 100644 --- a/spec/frontend/vue_shared/components/issue/issue_warning_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_warning_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import issueWarning from '~/vue_shared/components/issue/issue_warning.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import issueWarning from '~/vue_shared/components/issue/issue_warning.vue'; const IssueWarning = Vue.extend(issueWarning); diff --git a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js index cc9b569793d..1500bdf9c70 100644 --- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js +++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import { formatDate } from '~/lib/utils/datetime_utility'; import { mount, createLocalVue } from '@vue/test-utils'; +import { formatDate } from '~/lib/utils/datetime_utility'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; import { defaultAssignees, diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js index b006f72b8ee..4cd0f62da0f 100644 --- a/spec/frontend/vue_shared/components/markdown/field_spec.js +++ b/spec/frontend/vue_shared/components/markdown/field_spec.js @@ -1,9 +1,9 @@ import { mount, createLocalVue } from '@vue/test-utils'; -import fieldComponent from '~/vue_shared/components/markdown/field.vue'; import { TEST_HOST } from 'spec/test_constants'; import AxiosMockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import $ from 'jquery'; +import axios from '~/lib/utils/axios_utils'; +import fieldComponent from '~/vue_shared/components/markdown/field.vue'; const markdownPreviewPath = `${TEST_HOST}/preview`; const markdownDocsPath = `${TEST_HOST}/docs`; diff --git a/spec/frontend/vue_shared/components/memory_graph_spec.js b/spec/frontend/vue_shared/components/memory_graph_spec.js index 93f32f0b278..9a5ee544d8f 100644 --- a/spec/frontend/vue_shared/components/memory_graph_spec.js +++ b/spec/frontend/vue_shared/components/memory_graph_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; -import MemoryGraph from '~/vue_shared/components/memory_graph.vue'; import { GlSparklineChart } from '@gitlab/ui/dist/charts'; +import MemoryGraph from '~/vue_shared/components/memory_graph.vue'; describe('MemoryGraph', () => { const Component = Vue.extend(MemoryGraph); diff --git a/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js b/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js index 976e38c15ee..81c5cd6a057 100644 --- a/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import placeholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import placeholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; describe('placeholder system note component', () => { let PlaceholderSystemNote; diff --git a/spec/frontend/vue_shared/components/paginated_list_spec.js b/spec/frontend/vue_shared/components/paginated_list_spec.js index 92b48ce9974..4e1b29a4d3a 100644 --- a/spec/frontend/vue_shared/components/paginated_list_spec.js +++ b/spec/frontend/vue_shared/components/paginated_list_spec.js @@ -1,6 +1,6 @@ +import { mount } from '@vue/test-utils'; import PaginatedList from '~/vue_shared/components/paginated_list.vue'; import { PREV, NEXT } from '~/vue_shared/components/pagination/constants'; -import { mount } from '@vue/test-utils'; describe('Pagination links component', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/resizable_chart_container_spec.js b/spec/frontend/vue_shared/components/resizable_chart_container_spec.js index 8f533e8ab24..552cfade7b6 100644 --- a/spec/frontend/vue_shared/components/resizable_chart_container_spec.js +++ b/spec/frontend/vue_shared/components/resizable_chart_container_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { mount } from '@vue/test-utils'; -import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; import $ from 'jquery'; +import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; jest.mock('~/lib/utils/common_utils', () => ({ debounceByAnimationFrame(callback) { diff --git a/spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js b/spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js index 691ebe43d6b..31316a93ecd 100644 --- a/spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/collapsed_calendar_icon_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import collapsedCalendarIcon from '~/vue_shared/components/sidebar/collapsed_calendar_icon.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import collapsedCalendarIcon from '~/vue_shared/components/sidebar/collapsed_calendar_icon.vue'; describe('collapsedCalendarIcon', () => { let vm; diff --git a/spec/frontend/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js b/spec/frontend/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js index 062ebfa01c9..65255968bc7 100644 --- a/spec/frontend/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/collapsed_grouped_date_picker_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import collapsedGroupedDatePicker from '~/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import collapsedGroupedDatePicker from '~/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue'; describe('collapsedGroupedDatePicker', () => { let vm; diff --git a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js index 5e2bca6efc9..198af09c9f5 100644 --- a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import sidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import sidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue'; describe('sidebarDatePicker', () => { let vm; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js index 91865dcea0a..da22034a8db 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; +import { shallowMount } from '@vue/test-utils'; import LabelsSelect from '~/labels_select'; import BaseComponent from '~/vue_shared/components/sidebar/labels_select/base.vue'; -import { shallowMount } from '@vue/test-utils'; import { mockConfig, mockLabels, diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_button_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_button_spec.js index bb33dc6ea0f..e2e11c94c0d 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_button_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_button_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; +import mountComponent from 'helpers/vue_mount_component_helper'; import dropdownButtonComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_button.vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { mockConfig, mockLabels, diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js index 1c25d42682c..d0299523137 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_create_label_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; +import mountComponent from 'helpers/vue_mount_component_helper'; import dropdownCreateLabelComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { mockSuggestedColors } from '../../../../../javascripts/vue_shared/components/sidebar/labels_select/mock_data'; const createComponent = headerTitle => { diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_footer_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_footer_spec.js index 989901a0012..784bbaf8e6a 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_footer_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_footer_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; +import mountComponent from 'helpers/vue_mount_component_helper'; import dropdownFooterComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_footer.vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { mockConfig } from '../../../../../javascripts/vue_shared/components/sidebar/labels_select/mock_data'; const createComponent = ( diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_header_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_header_spec.js index c36a82e1a35..2e721d75b40 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_header_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_header_spec.js @@ -1,8 +1,7 @@ import Vue from 'vue'; -import dropdownHeaderComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_header.vue'; - import mountComponent from 'helpers/vue_mount_component_helper'; +import dropdownHeaderComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_header.vue'; const createComponent = () => { const Component = Vue.extend(dropdownHeaderComponent); diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_search_input_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_search_input_spec.js index 2fffb2e495e..035af946d75 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_search_input_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_search_input_spec.js @@ -1,8 +1,7 @@ import Vue from 'vue'; -import dropdownSearchInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_search_input.vue'; - import mountComponent from 'helpers/vue_mount_component_helper'; +import dropdownSearchInputComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_search_input.vue'; const createComponent = () => { const Component = Vue.extend(dropdownSearchInputComponent); diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js index 1616e657c81..2fffb31acf5 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js @@ -1,8 +1,7 @@ import Vue from 'vue'; -import dropdownTitleComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_title.vue'; - import mountComponent from 'helpers/vue_mount_component_helper'; +import dropdownTitleComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_title.vue'; const createComponent = (canEdit = true) => { const Component = Vue.extend(dropdownTitleComponent); diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js index 517f2c01c46..887c04268d1 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; +import mountComponent from 'helpers/vue_mount_component_helper'; import dropdownValueCollapsedComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { mockLabels } from '../../../../../javascripts/vue_shared/components/sidebar/labels_select/mock_data'; const createComponent = (labels = mockLabels) => { diff --git a/spec/frontend/vue_shared/components/sidebar/toggle_sidebar_spec.js b/spec/frontend/vue_shared/components/sidebar/toggle_sidebar_spec.js index 5cf25ca6f81..4342f5e2105 100644 --- a/spec/frontend/vue_shared/components/sidebar/toggle_sidebar_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/toggle_sidebar_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import toggleSidebar from '~/vue_shared/components/sidebar/toggle_sidebar.vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import toggleSidebar from '~/vue_shared/components/sidebar/toggle_sidebar.vue'; describe('toggleSidebar', () => { let vm; diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js index 2f87359a4a6..e76b2ca2d65 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_image_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; +import defaultAvatarUrl from 'images/no_avatar.png'; import { placeholderImage } from '~/lazy_loader'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; -import defaultAvatarUrl from 'images/no_avatar.png'; jest.mock('images/no_avatar.png', () => 'default-avatar-url'); diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js index bdd18110629..7f5df02d51d 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js @@ -2,9 +2,9 @@ import _ from 'underscore'; import { trimText } from 'helpers/text_helper'; import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { TEST_HOST } from 'spec/test_constants'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; -import { TEST_HOST } from 'spec/test_constants'; describe('User Avatar Link Component', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js index 2750b54521a..f2e743cc1f6 100644 --- a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js @@ -1,7 +1,7 @@ -import UserPopover from '~/vue_shared/components/user_popover/user_popover.vue'; import { GlSkeletonLoading } from '@gitlab/ui'; -import Icon from '~/vue_shared/components/icon.vue'; import { shallowMount } from '@vue/test-utils'; +import UserPopover from '~/vue_shared/components/user_popover/user_popover.vue'; +import Icon from '~/vue_shared/components/icon.vue'; const DEFAULT_PROPS = { loaded: true, |