Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 6 deletions

diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js
index 203781bb6fc..fff76f158dd 100644
--- a/spec/frontend/test_setup.js
+++ b/spec/frontend/test_setup.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
 import * as jqueryMatchers from 'custom-jquery-matchers';
-import $ from 'jquery';
 import { config as testUtilsConfig } from '@vue/test-utils';
 import Translate from '~/vue_shared/translate';
 import { initializeTestTimeout } from './helpers/timeout';
@@ -9,11 +8,9 @@ import { setupManualMocks } from './mocks/mocks_helper';
 import customMatchers from './matchers';
 
 import './helpers/dom_shims';
-
-// Expose jQuery so specs using jQuery plugins can be imported nicely.
-// Here is an issue to explore better alternatives:
-// https://gitlab.com/gitlab-org/gitlab/issues/12448
-window.jQuery = $;
+import './helpers/jquery';
+import '~/commons/jquery';
+import '~/commons/bootstrap';
 
 process.on('unhandledRejection', global.promiseRejectionHandler);