include common libraries within spec_helper

10 files changed, 20 insertions, 10 deletions

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 5cba995888a..8dd9cf5b960 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -58,7 +58,7 @@ var config = {
       {
         test: /\.(js|es6)$/,
         loader: 'imports-loader',
-        query: '$=jquery,jQuery=jquery,this=>window'
+        query: 'this=>window'
       },
       {
         test: /\.json$/,
diff --git a/package.json b/package.json
index ca767ebec9c..cea0ea4884c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "jasmine-jquery": "^2.1.1",
     "karma": "^1.3.0",
     "karma-jasmine": "^1.1.0",
-    "karma-jquery": "^0.1.0",
     "karma-webpack": "^1.8.0"
   }
 }
diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 8b0c797647b..1821c44fdfb 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -7,7 +7,6 @@ require('lib/utils/datetime_utility');
 require('build');
 require('breakpoints');
 require('vendor/jquery.nicescroll');
-require('vendor/turbolinks');
 
 describe('Build', () => {
   const BUILD_URL = `${gl.TEST_HOST}/frontend-fixtures/builds-project/builds/1`;
diff --git a/spec/javascripts/gl_dropdown_spec.js.es6 b/spec/javascripts/gl_dropdown_spec.js.es6
index fac5b20ea7e..7b2b4771756 100644
--- a/spec/javascripts/gl_dropdown_spec.js.es6
+++ b/spec/javascripts/gl_dropdown_spec.js.es6
@@ -3,7 +3,6 @@
 
 require('./spec_helper');
 require('gl_dropdown');
-require('vendor/turbolinks');
 require('lib/utils/common_utils');
 require('lib/utils/type_utility');
 
diff --git a/spec/javascripts/issuable_spec.js.es6 b/spec/javascripts/issuable_spec.js.es6
index b5f4b3d6751..5d3269626af 100644
--- a/spec/javascripts/issuable_spec.js.es6
+++ b/spec/javascripts/issuable_spec.js.es6
@@ -3,7 +3,6 @@
 
 require('./spec_helper');
 require('issuable');
-require('turbolinks');
 
 (() => {
   const BASE_URL = '/user/project/issues?scope=all&state=closed';
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index e257deac201..75f5192a54e 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -2,7 +2,6 @@
 /* global Notes */
 
 require('./spec_helper');
-window._ = require('underscore');
 require('notes');
 require('vendor/autosize');
 require('gl_form');
diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js
index bc09bbbe512..a438b01fbce 100644
--- a/spec/javascripts/project_title_spec.js
+++ b/spec/javascripts/project_title_spec.js
@@ -2,7 +2,6 @@
 /* global Project */
 
 require('./spec_helper');
-require('bootstrap/js/dropdown');
 require('select2/select2.js');
 require('lib/utils/type_utility');
 require('gl_dropdown');
diff --git a/spec/javascripts/search_autocomplete_spec.js b/spec/javascripts/search_autocomplete_spec.js
index d919a754a75..4ac9117fd8a 100644
--- a/spec/javascripts/search_autocomplete_spec.js
+++ b/spec/javascripts/search_autocomplete_spec.js
@@ -6,8 +6,6 @@ require('search_autocomplete');
 require('lib/utils/common_utils');
 require('lib/utils/type_utility');
 require('vendor/fuzzaldrin-plus');
-require('vendor/turbolinks');
-require('vendor/jquery.turbolinks');
 
 (function() {
   var addBodyAttributes, assertLinks, dashboardIssuesPath, dashboardMRsPath, groupIssuesPath, groupMRsPath, groupName, mockDashboardOptions, mockGroupOptions, mockProjectOptions, projectIssuesPath, projectMRsPath, projectName, userId, widget;
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index b6dcdba927b..64f1ca4b80d 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -1,8 +1,27 @@
 require('jasmine-jquery');
 
+// include common libraries
+window.$ = window.jQuery = require('jquery');
+window._ = require('underscore');
+require('vendor/turbolinks');
+require('vendor/jquery.turbolinks');
+require('bootstrap/js/affix');
+require('bootstrap/js/alert');
+require('bootstrap/js/button');
+require('bootstrap/js/collapse');
+require('bootstrap/js/dropdown');
+require('bootstrap/js/modal');
+require('bootstrap/js/scrollspy');
+require('bootstrap/js/tab');
+require('bootstrap/js/transition');
+require('bootstrap/js/tooltip');
+require('bootstrap/js/popover');
+
+// configure jasmine
 jasmine.getFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
 jasmine.getJSONFixtures().fixturesPath = 'base/spec/javascripts/fixtures';
 
+// stub expected globals
 window.gl = window.gl || {};
 window.gl.TEST_HOST = 'http://test.host';
 window.gon = window.gon || {};
diff --git a/spec/javascripts/subbable_resource_spec.js.es6 b/spec/javascripts/subbable_resource_spec.js.es6
index c24e860afd1..a70a1419792 100644
--- a/spec/javascripts/subbable_resource_spec.js.es6
+++ b/spec/javascripts/subbable_resource_spec.js.es6
@@ -1,7 +1,6 @@
 /* eslint-disable max-len, arrow-parens, comma-dangle, no-plusplus */
 
 require('./spec_helper');
-window._ = require('underscore');
 require('subbable_resource');
 
 /*