diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:48 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-20 22:20:48 +0000 |
commit | 35c8fd5586ac4fe9fb192974bcba519bfc1eb964 (patch) | |
tree | d7573838c094933a4cb47278ac3c93af2154db69 /spec/javascripts/test_bundle.js | |
parent | 86c9c93de709c9013572682b868b5e6db429dd1e (diff) | |
download | gitlab-ce-35c8fd5586ac4fe9fb192974bcba519bfc1eb964.tar.gz |
Update to jQuery 3.
Diffstat (limited to 'spec/javascripts/test_bundle.js')
-rw-r--r-- | spec/javascripts/test_bundle.js | 5 |
1 files changed, 4 insertions, 1 deletions
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) { |