diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-05-16 16:02:06 -0500 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-05-16 16:02:06 -0500 |
commit | fc4cabca090e69be2ad7742deaed366f48065e66 (patch) | |
tree | c397d421774b1213bf8a5ef6428539638929fede /spec | |
parent | 283f968ef2826914d1ab7b1ddb59ad1cbe441ff0 (diff) | |
download | gitlab-ce-fc4cabca090e69be2ad7742deaed366f48065e66.tar.gz |
update test_bundle to use ES module syntax
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/test_bundle.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/spec/javascripts/test_bundle.js b/spec/javascripts/test_bundle.js index 0464b5d2329..13827a26571 100644 --- a/spec/javascripts/test_bundle.js +++ b/spec/javascripts/test_bundle.js @@ -1,13 +1,15 @@ -// enable test fixtures -require('jasmine-jquery'); +import $ from 'jquery'; +import _ from 'underscore'; +import 'jasmine-jquery'; +import '~/commons'; +// enable test fixtures jasmine.getFixtures().fixturesPath = '/base/spec/javascripts/fixtures'; jasmine.getJSONFixtures().fixturesPath = '/base/spec/javascripts/fixtures'; -// include common libraries -require('~/commons/index.js'); -window.$ = window.jQuery = require('jquery'); -window._ = require('underscore'); +// globalize common libraries +window.$ = window.jQuery = $; +window._ = _; // stub expected globals window.gl = window.gl || {}; |