diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
| commit | 11c1fc1fae5810123f683630c92bf1e9e7eab3d0 (patch) | |
| tree | f1d0a5a73539b8b7be172be6cb91ccaf6b3dd420 /spec/javascripts/test_bundle.js | |
| parent | 84016f8335f885538dd1ddc9b88cc716324b9613 (diff) | |
| parent | 88870c871eeb55ff43cf638ba8d7307b263393c3 (diff) | |
| download | gitlab-ce-11c1fc1fae5810123f683630c92bf1e9e7eab3d0.tar.gz | |
Resolved conflicts with master
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 9d2dee990fd..9f0d8f0d01c 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'; @@ -143,6 +143,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) { |