From 35c8fd5586ac4fe9fb192974bcba519bfc1eb964 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz@gitlab.com>
Date: Tue, 20 Feb 2018 22:20:48 +0000
Subject: Update to jQuery 3.

---
 spec/javascripts/test_bundle.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spec/javascripts/test_bundle.js')

diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js
index 9b2a5379855..323b8a9572d 100644
--- a/spec/javascripts/test_bundle.js
+++ b/spec/javascripts/test_bundle.js
@@ -1,6 +1,6 @@
 /* eslint-disable jasmine/no-global-setup */
 import $ from 'jquery';
-import 'jasmine-jquery';
+import 'vendor/jasmine-jquery';
 import '~/commons';
 
 import Vue from 'vue';
@@ -144,6 +144,9 @@ if (process.env.BABEL_ENV === 'coverage') {
 
   describe('Uncovered files', function () {
     const sourceFiles = require.context('~', true, /\.js$/);
+
+    $.holdReady(true);
+
     sourceFiles.keys().forEach(function (path) {
       // ignore if there is a matching spec file
       if (testsContext.keys().indexOf(`${path.replace(/\.js$/, '')}_spec`) > -1) {
-- 
cgit v1.2.1