refactoring-tests

Author: goenning

package.json

@@ -5,8 +5,8 @@
   "main": "lib/miniprofiler.js",
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha tests/",
-    "test:watch": "mocha tests/ --watch",
+    "test": "mocha tests/ -c",
+    "test:watch": "mocha tests/ -c --watch",
     "example": "node examples/express.js",
     "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- tests/ -R spec",
     "check-coverage": "istanbul check-coverage --statements 70 --branches 70 --functions 70 --lines 70",

tests/assets-test.js

@@ -1,11 +1,10 @@
 var expect = require('chai').expect;
 var fs = require('fs');
+var servers = require('./servers');
 
-for (var fw of ['express', 'koa']) {
-  var server = require(`./server/${fw}/default`);
-
-  describe(`[${fw}] MiniProfiler Assets Tests`, function() {
-    before(server.start);
+for (var server of servers) {
+  describe(`[${server.framework}] MiniProfiler Assets Tests`, function() {
+    before(server.start.bind(null, 'default'));
     after(server.stop);
 
     var files = [
@@ -17,8 +16,10 @@ for (var fw of ['express', 'koa']) {
     files.forEach((file) => {
       it(`Should return ${file} file`, function(done) {
         server.get(`/mini-profiler-resources/${file}`, (err, response, body) => {
-          expect(body).to.be.equal(fs.readFileSync(`./ui/${file}`, 'utf-8'));
-          done();
+          fs.readFile(`./ui/${file}`, 'utf-8', (err, content) => {
+            expect(body).to.be.equal(content);
+            done();
+          });
         });
       });
     });

tests/basic-test.js

@@ -1,10 +1,10 @@
 var expect = require('chai').expect;
+var servers = require('./servers');
 
-for (var fw of ['express', 'koa']) {
-  var server = require(`./server/${fw}/default`);
+for (var server of servers) {
 
-  describe(`[${fw}] MiniProfiler Tests`, function() {
-    before(server.start);
+  describe(`[${server.framework}] MiniProfiler Tests`, function() {
+    before(server.start.bind(null, 'default'));
     after(server.stop);
 
     it('Profiled routes should always return Profiler ID', function(done) {
@@ -23,7 +23,7 @@ for (var fw of ['express', 'koa']) {
           var result = JSON.parse(body);
           expect(result.Id).to.equal(ids[0]);
           expect(result.Name).to.equal('/js-sleep');
-          expect(result.DurationMilliseconds).to.be.above(200);
+          expect(result.DurationMilliseconds).to.be.above(50);
           expect(result.Root.Children).to.be.empty;
           expect(result.Root.CustomTimings).to.have.property('custom');
           expect(result.Root.CustomTimings.custom).to.have.lengthOf(1);

tests/server/base.js

@@ -26,7 +26,7 @@ app.get('/step-two', (req, res) => {
 app.get('/js-sleep', function(req, res) {
 	req.miniprofiler.timeQuery('custom', 'Sleeping...', setTimeout, function() {
 		res.send();
-	}, 300);
+	}, 50);
 });
 
-module.exports = require('../base.js')(app);
+module.exports = app;

tests/server/express/default.js tests/servers/express/default.jstests/server/express/default.js renamed to tests/servers/express/default.js

@@ -0,0 +1,10 @@
+var server;
+module.exports = {
+  start: function(name) {
+    var app = require(`./${name}.js`);
+    server = app.listen(8080);
+  },
+  stop: function() {
+    server.close();
+  }
+}

tests/servers/express/index.js

@@ -13,4 +13,4 @@ app.get('/', (req, res) => {
 	res.send();
 });
 
-module.exports = require('../base.js')(app);
+module.exports = app;

tests/server/express/unprofiled.js tests/servers/express/unprofiled.jstests/server/express/unprofiled.js renamed to tests/servers/express/unprofiled.js

@@ -0,0 +1,24 @@
+var request = require('request');
+var frameworks = [ 'koa', 'express' ];
+var all = [ ];
+
+for (var fw of frameworks) {
+  server = require(`./${fw}`)
+  server.framework = fw;
+
+  server.get = (path, cb) => {
+    request.get(`http://localhost:8080${path}`, (err, response, body) => {
+      cb(err, response, body);
+    });
+  }
+
+  server.post = (path, params, cb) => {
+    request.post({url: `http://localhost:8080${path}`, form: params }, (err, response, body) => {
+      cb(err, response, body);
+    });
+  }
+
+  all.push(server);
+}
+
+module.exports = all;

tests/servers/index.js

@@ -28,8 +28,8 @@ app.use(route.get('/js-sleep', function *(){
     this.req.miniprofiler.timeQuery('custom', 'Sleeping...', setTimeout, function() {
       this.body = '';
       resolve();
-    }, 300);
+    }, 50);
   });
 }));
 
-module.exports = require('../base.js')(app);
+module.exports = app;

tests/server/koa/default.js tests/servers/koa/default.jstests/server/koa/default.js renamed to tests/servers/koa/default.js

@@ -0,0 +1,10 @@
+var server;
+module.exports = {
+  start: function(name) {
+    var app = require(`./${name}.js`);
+    server = app.listen(8080);
+  },
+  stop: function() {
+    server.close();
+  }
+}