diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 21:08:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-15 21:08:59 +0000 |
commit | 367e7db836dd84ee39adcca18d973c1d530088aa (patch) | |
tree | ade004c21cda52721546ad67de82455b6fbe1618 /spec/javascripts/test_bundle.js | |
parent | fb994e98ecce2a1f1dfaa87c9c3de8535815813b (diff) | |
download | gitlab-ce-367e7db836dd84ee39adcca18d973c1d530088aa.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r-- | spec/javascripts/test_bundle.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index faa07775aaa..bf56a50b67f 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -2,19 +2,18 @@ jasmine/no-global-setup, no-underscore-dangle, no-console */ +import { config as testUtilsConfig } from '@vue/test-utils'; +import jasmineDiff from 'jasmine-diff'; import $ from 'jquery'; import 'core-js/features/set-immediate'; import 'vendor/jasmine-jquery'; import '~/commons'; import Vue from 'vue'; -import jasmineDiff from 'jasmine-diff'; -import { config as testUtilsConfig } from '@vue/test-utils'; -import Translate from '~/vue_shared/translate'; - import { getDefaultAdapter } from '~/lib/utils/axios_utils'; -import { FIXTURES_PATH, TEST_HOST } from './test_constants'; +import Translate from '~/vue_shared/translate'; import customMatchers from './matchers'; +import { FIXTURES_PATH, TEST_HOST } from './test_constants'; // Tech debt issue TBD testUtilsConfig.logModifiedComponents = false; |