fixed intermittent test error

Author: goenning

lib/middlewares/hapi.js

@@ -20,15 +20,11 @@ module.exports = function(f, profiler) {
 					var reqPath = sp[sp.length - 1];
 					if(reqPath == 'results')
 						profiler.results(request.raw.req, request.raw.res, (result) => {
-							request.raw.res.setHeader('Content-Type', result.type);
-							request.raw.res.writeHead(result.status);
-							request.raw.res.end(result.body);
+              return reply(result.body).type(result.type).code(result.status);
 						});
 					else
 						profiler.static(reqPath, request.raw.res, (result) => {
-							request.raw.res.setHeader('Content-Type', result.type);
-							request.raw.res.writeHead(result.status);
-							request.raw.res.end(result.body);
+              return reply(result.body).type(result.type).code(result.status);
 						});
 					return;
 				}
@@ -48,6 +44,7 @@ module.exports = function(f, profiler) {
 				return reply.continue();
 
 			});
+
 			next();
 		}
 	};

lib/miniprofiler.js

@@ -21,34 +21,21 @@ _.templateSettings = {
 	interpolate: /\{(.+?)\}/g
 };
 
-var shared = function() {
-	return {
-		configure,
-		startProfiling,
-		stopProfiling,
-		results,
-		static,
-		resourcePath
-	};
-};
-
 // EXPORTS
 exports.configure = configure;
-exports.express = function(f) {
-	return require('./middlewares/express.js')(f, shared());
-};
 
-exports.koa = function(f) {
-	return require('./middlewares/koa.js')(f, shared());
-};
-
-exports.hapi = function(f) {
-	return require('./middlewares/hapi.js')(f, shared());
-};
-
-exports.http = function(f) {
-	return require('./middlewares/http.js')(f, shared());
-};
+_(['express', 'hapi', 'koa', 'http']).each((framework) => {
+  exports[framework] = function(f) {
+    return require(`./middlewares/${framework}.js`)(f, {
+      configure,
+      startProfiling,
+      stopProfiling,
+      results,
+      static,
+      resourcePath
+    });
+  };
+});
 
 exports.for = {
 	pg: require('./providers/miniprofiler.pg.js'),

tests/servers/express/index.js

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

tests/servers/hapi/index.js

@@ -1,12 +1,10 @@
 var server;
 module.exports = {
-  start: function(name) {
+  start: function(name, done) {
     server = require(`./${name}.js`);
-    server.start((err) => {
-      if (err) throw err;
-    });
+    server.start(done);
   },
-  stop: function() {
-    server.stop();
+  stop: function(done) {
+    server.stop(done);
   }
 };

tests/servers/http/index.js

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

tests/servers/index.js

@@ -1,3 +1,4 @@
+var debug = require('debug')('miniprofiler:tests');
 var request = require('request');
 var frameworks = [ 'koa', 'express', 'hapi', 'http' ];
 var all = [ ];
@@ -8,12 +9,14 @@ for (var fw of frameworks) {
 
   server.get = (path, cb) => {
     request.get(`http://localhost:8080${path}`, (err, response, body) => {
+      if (err) debug(err);
       cb(err, response, body);
     });
   };
 
   server.post = (path, params, cb) => {
     request.post({url: `http://localhost:8080${path}`, form: params }, (err, response, body) => {
+      if (err) debug(err);
       cb(err, response, body);
     });
   };

tests/servers/koa/index.js

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