From 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 18 Feb 2021 10:34:06 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-9-stable-ee --- spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js | 2 +- spec/frontend/blob/components/__snapshots__/blob_header_spec.js.snap | 2 +- spec/frontend/blob/components/blob_content_error_spec.js | 2 +- spec/frontend/blob/components/blob_content_spec.js | 4 ++-- spec/frontend/blob/components/blob_edit_header_spec.js | 2 +- spec/frontend/blob/components/blob_header_default_actions_spec.js | 2 +- spec/frontend/blob/components/blob_header_filepath_spec.js | 2 +- spec/frontend/blob/components/blob_header_spec.js | 2 +- spec/frontend/blob/components/blob_header_viewer_switcher_spec.js | 2 +- spec/frontend/blob/notebook/notebook_viever_spec.js | 4 ++-- spec/frontend/blob/pdf/pdf_viewer_spec.js | 2 +- spec/frontend/blob/pipeline_tour_success_modal_spec.js | 4 ++-- spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js | 2 +- spec/frontend/blob/utils_spec.js | 2 +- spec/frontend/blob/viewer/index_spec.js | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) (limited to 'spec/frontend/blob') diff --git a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js index 09c49617bc5..d7531d15b9a 100644 --- a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js +++ b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js @@ -1,7 +1,7 @@ import sqljs from 'sql.js'; import ClassSpecHelper from 'helpers/class_spec_helper'; -import axios from '~/lib/utils/axios_utils'; import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer'; +import axios from '~/lib/utils/axios_utils'; jest.mock('sql.js'); diff --git a/spec/frontend/blob/components/__snapshots__/blob_header_spec.js.snap b/spec/frontend/blob/components/__snapshots__/blob_header_spec.js.snap index b54efb93bc9..31fb6addcac 100644 --- a/spec/frontend/blob/components/__snapshots__/blob_header_spec.js.snap +++ b/spec/frontend/blob/components/__snapshots__/blob_header_spec.js.snap @@ -9,7 +9,7 @@ exports[`Blob Header Default Actions rendering matches the snapshot 1`] = ` />
{ let wrapper; diff --git a/spec/frontend/blob/components/blob_edit_header_spec.js b/spec/frontend/blob/components/blob_edit_header_spec.js index 22e8e6d986c..ac3080c65a5 100644 --- a/spec/frontend/blob/components/blob_edit_header_spec.js +++ b/spec/frontend/blob/components/blob_edit_header_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BlobEditHeader from '~/blob/components/blob_edit_header.vue'; describe('Blob Header Editing', () => { diff --git a/spec/frontend/blob/components/blob_header_default_actions_spec.js b/spec/frontend/blob/components/blob_header_default_actions_spec.js index e2c73a5d5d9..bce65899c43 100644 --- a/spec/frontend/blob/components/blob_header_default_actions_spec.js +++ b/spec/frontend/blob/components/blob_header_default_actions_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButtonGroup, GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import BlobHeaderActions from '~/blob/components/blob_header_default_actions.vue'; import { BTN_COPY_CONTENTS_TITLE, diff --git a/spec/frontend/blob/components/blob_header_filepath_spec.js b/spec/frontend/blob/components/blob_header_filepath_spec.js index 7b8b5050486..d935f73c0d1 100644 --- a/spec/frontend/blob/components/blob_header_filepath_spec.js +++ b/spec/frontend/blob/components/blob_header_filepath_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; import BlobHeaderFilepath from '~/blob/components/blob_header_filepath.vue'; +import { numberToHumanSize } from '~/lib/utils/number_utils'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { Blob as MockBlob } from './mock_data'; -import { numberToHumanSize } from '~/lib/utils/number_utils'; jest.mock('~/lib/utils/number_utils', () => ({ numberToHumanSize: jest.fn(() => 'a lot'), diff --git a/spec/frontend/blob/components/blob_header_spec.js b/spec/frontend/blob/components/blob_header_spec.js index b3f80183f6b..865e8ab1124 100644 --- a/spec/frontend/blob/components/blob_header_spec.js +++ b/spec/frontend/blob/components/blob_header_spec.js @@ -1,8 +1,8 @@ import { shallowMount, mount } from '@vue/test-utils'; import BlobHeader from '~/blob/components/blob_header.vue'; -import ViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import DefaultActions from '~/blob/components/blob_header_default_actions.vue'; import BlobFilepath from '~/blob/components/blob_header_filepath.vue'; +import ViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import { Blob } from './mock_data'; diff --git a/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js b/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js index cf1101bc22c..9a560ec11f7 100644 --- a/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js +++ b/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButtonGroup, GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import BlobHeaderViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import { RICH_BLOB_VIEWER, diff --git a/spec/frontend/blob/notebook/notebook_viever_spec.js b/spec/frontend/blob/notebook/notebook_viever_spec.js index f6a926a5ecb..604104bb31f 100644 --- a/spec/frontend/blob/notebook/notebook_viever_spec.js +++ b/spec/frontend/blob/notebook/notebook_viever_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import component from '~/blob/notebook/notebook_viewer.vue'; +import axios from '~/lib/utils/axios_utils'; import NotebookLab from '~/notebook/index.vue'; describe('iPython notebook renderer', () => { diff --git a/spec/frontend/blob/pdf/pdf_viewer_spec.js b/spec/frontend/blob/pdf/pdf_viewer_spec.js index 0eea3aea639..e332ea49fa6 100644 --- a/spec/frontend/blob/pdf/pdf_viewer_spec.js +++ b/spec/frontend/blob/pdf/pdf_viewer_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { FIXTURES_PATH } from 'spec/test_constants'; import component from '~/blob/pdf/pdf_viewer.vue'; diff --git a/spec/frontend/blob/pipeline_tour_success_modal_spec.js b/spec/frontend/blob/pipeline_tour_success_modal_spec.js index d4562019302..f4af57de41f 100644 --- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js +++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js @@ -1,8 +1,8 @@ +import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; -import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; -import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; import { stubComponent } from 'helpers/stub_component'; +import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; import pipelineTourSuccess from '~/blob/pipeline_tour_success_modal.vue'; import modalProps from './pipeline_tour_success_mock_data'; diff --git a/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js index e55b8e4af24..7e13994f2b7 100644 --- a/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js +++ b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js @@ -1,6 +1,6 @@ +import { GlButton } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; -import { GlButton } from '@gitlab/ui'; import Popover from '~/blob/suggest_gitlab_ci_yml/components/popover.vue'; import * as utils from '~/lib/utils/common_utils'; diff --git a/spec/frontend/blob/utils_spec.js b/spec/frontend/blob/utils_spec.js index fa83690c104..3ff2e47e0b6 100644 --- a/spec/frontend/blob/utils_spec.js +++ b/spec/frontend/blob/utils_spec.js @@ -1,5 +1,5 @@ -import Editor from '~/editor/editor_lite'; import * as utils from '~/blob/utils'; +import Editor from '~/editor/editor_lite'; jest.mock('~/editor/editor_lite'); diff --git a/spec/frontend/blob/viewer/index_spec.js b/spec/frontend/blob/viewer/index_spec.js index 4a5eb31602d..7449de48ec0 100644 --- a/spec/frontend/blob/viewer/index_spec.js +++ b/spec/frontend/blob/viewer/index_spec.js @@ -1,7 +1,7 @@ /* eslint-disable no-new */ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { setTestTimeout } from 'helpers/timeout'; import BlobViewer from '~/blob/viewer/index'; import axios from '~/lib/utils/axios_utils'; -- cgit v1.2.3