diff options
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r-- | spec/javascripts/test_bundle.js | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 59136de0b0d..be14d2ee7e7 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -2,20 +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 { getDefaultAdapter } from '~/lib/utils/axios_utils'; import Translate from '~/vue_shared/translate'; -import { getDefaultAdapter } from '~/lib/utils/axios_utils'; import { FIXTURES_PATH, TEST_HOST } from './test_constants'; -import customMatchers from './matchers'; - // Tech debt issue TBD testUtilsConfig.logModifiedComponents = false; @@ -58,7 +56,6 @@ beforeAll(() => { inline: window.__karma__.config.color, }), ); - jasmine.addMatchers(customMatchers); }); // globalize common libraries @@ -81,14 +78,6 @@ window.addEventListener('unhandledrejection', (event) => { console.error(event.reason.stack || event.reason); }); -// HACK: Chrome 59 disconnects if there are too many synchronous tests in a row -// because it appears to lock up the thread that communicates to Karma's socket -// This async beforeEach gets called on every spec and releases the JS thread long -// enough for the socket to continue to communicate. -// The downside is that it creates a minor performance penalty in the time it takes -// to run our unit tests. -beforeEach((done) => done()); - let longRunningTestTimeoutHandle; beforeEach((done) => { |