diff --git a/master.spec.js b/master.spec.js index 987a463f..b99fb297 100644 --- a/master.spec.js +++ b/master.spec.js @@ -2,6 +2,7 @@ var app = require('./master.js'), assert = require('assert'), request = require('supertest'); const validateHTML = require('html5-validator'); +var parallel = require('mocha.parallel'); describe('Master server endpoint testing', function() { @@ -33,7 +34,7 @@ describe('Master server endpoint testing', function() { }); }); // describe("#GET /api/") - describe("#GET static website data", function() { + parallel("#GET static website data", function() { it("sends some HTML when accessing /", function(done){ this.timeout(6000); request(app).get("/").end(function(err,res){ @@ -108,7 +109,7 @@ describe('Master server endpoint testing', function() { }); }); }); - describe("#POST /api/remove", function(){ + parallel("#POST /api/remove", function(){ it("returns an itemStack of how many items were removed", function(done){ persistentMaster.post("/api/remove") .send({ diff --git a/package-lock.json b/package-lock.json index cdb2b301..4d3600c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2680,6 +2680,24 @@ "integrity": "sha1-cjqTEOfXN9e3fHpmghI3QlsDLUg=", "dev": true }, + "mocha.parallel": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/mocha.parallel/-/mocha.parallel-0.15.3.tgz", + "integrity": "sha512-3UqVrq5XtAtR2eMHl/N6URoSmizwaCcc84iIETtytEMbP0cIo6KacpCJFmF1id090Ig+HmbAuakC7RM4msfC2Q==", + "dev": true, + "requires": { + "bluebird": "2.11.0", + "semaphore": "1.1.0" + }, + "dependencies": { + "bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=", + "dev": true + } + } + }, "mock-fs": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/mock-fs/-/mock-fs-4.4.2.tgz", @@ -3384,6 +3402,12 @@ "integrity": "sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==", "dev": true }, + "semaphore": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz", + "integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==", + "dev": true + }, "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", diff --git a/package.json b/package.json index 8c03b880..94045fee 100644 --- a/package.json +++ b/package.json @@ -52,6 +52,7 @@ "istanbul": "^0.4.5", "mocha": "^3.5.3", "mocha-sinon": "^2.0.0", + "mocha.parallel": "^0.15.3", "mock-fs": "^4.4.2", "nock": "^9.0.25", "sinon": "^2.4.1",