Update tests to use a setup file

nice-digital · Sep 26, 2016 · c4394de · c4394de
1 parent 954eeda
commit c4394de
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/.grunt-tasks/mochaTest.js b/.grunt-tasks/mochaTest.js
@@ -1,8 +1,8 @@
 module.exports = {
 	test : {
-		src: ["test/**/*.js"],
+		src: ["test/**/*.spec.js"],
 		options: {
-			require: "babel-core/register"
+			require: ["babel-core/register", "./test/_setup.js"]
 		}
 	}
 };
diff --git a/package.json b/package.json
@@ -23,9 +23,9 @@
     "start": "grunt",
     "webpack:dev": "SET \"NODE_ENV=development\" && webpack --progress --colors --display-error-details",
     "webpack:dist": "SET \"NODE_ENV=production\" && webpack --config ./webpack.production.config.js",
-    "test": "mocha test/**/*.spec.js --require babel-core/register",
-    "test:coverage": "node ./node_modules/istanbul/lib/cli cover node_modules/mocha/bin/_mocha -- --compilers js:babel-register --recursive test",
-    "test:watch": "mocha test/**/*.spec.js --require babel-core/register --reporter min --watch",
+    "test": "mocha test/**/*.spec.js --require babel-core/register test/_setup.js",
+    "test:watch": "mocha test/**/*.spec.js --require babel-core/register test/_setup.js --reporter min --watch",
+    "test:coverage": "node ./node_modules/istanbul/lib/cli cover node_modules/mocha/bin/_mocha -- --compilers js:babel-register --require test/_setup.js test/**/*.spec.js",
     "lint": "grunt lint",
     "serve": "set PORT=54321&& node web/server",
     "prepublish": "grunt prepublish"

diff --git a/test/_setup.js b/test/_setup.js
@@ -0,0 +1,11 @@
+/* eslint-env node, mocha */
+
+/**
+ * Setup dependencies for Mocha tests
+ */
+
+const jsdom = require("jsdom");
+
+global.document = jsdom.jsdom("<html><head></head><body></body></html>");
+global.window = document.defaultView;
+global.jQuery = global.$ = require("jquery");
diff --git a/test/unit/tabs.spec.js b/test/unit/tabs.spec.js
@@ -1,7 +1,6 @@
 /* eslint-env node, mocha */
 
-const should = require("should"),
-	jsdom = require("jsdom");
+const should = require("should");
 
 const KeyCodes = {
 	Enter: 13,
@@ -59,14 +58,12 @@ describe("Tabs", function() {
 	`;
 
 	before(function () {
-		document = global.document = jsdom.jsdom("<html><head></head><body></body></html>");
-		global.window = document.defaultView;
-		$ = global.jQuery = global.$ = require("jquery");
+		document = global.document;
+		$ = global.$;
 
 		Tabs = require("../../src/javascripts/tabs.js").default;
 	});
 
-
 	describe("jQuery integration", function() {
 
 		it("defined on jquery object", function() {