tests refactoring

Author: goenning

tests/assets-test.js

@@ -1,5 +1,5 @@
 var expect = require('chai').expect;
-var server = require('./server');
+var server = require('./server/default');
 var fs = require('fs');
 
 describe('MiniProfiler Assets Tests', function() {

tests/basic-test.js

@@ -1,5 +1,5 @@
 var expect = require('chai').expect;
-var server = require('./server');
+var server = require('./server/default');
 
 describe('MiniProfiler Tests', function() {
   before(server.start);
@@ -11,11 +11,5 @@ describe('MiniProfiler Tests', function() {
       done();
     });
   });
-
-  it('Unprofiled route should not return Profiler ID', function(done) {
-    server.get('/unprofiled', (err, response) => {
-      expect(response.headers).to.not.include.keys('x-miniprofiler-ids');
-      done();
-    });
-  });
+  
 });

tests/server/base.js

@@ -0,0 +1,24 @@
+var request = require('request');
+
+module.exports = function(app) {
+  var server;
+  return {
+    start: () => {
+      server = app.listen(8080);
+    },
+    stop: () => {
+      server.close();
+    },
+    get: (path, cb) => {
+      request.get(`http://localhost:8080${path}`, (err, response, body) => {
+        cb(err, response, body);
+      });
+    },
+    post: (path, params, cb) => {
+      request.post({url: `http://localhost:8080${path}`, form: params }, (err, response, body) => {
+        cb(err, response, body);
+      });
+    }
+  };
+
+};

tests/server/default.js

@@ -0,0 +1,26 @@
+var miniprofiler = require('../../lib/miniprofiler.js');
+var express = require('express');
+
+var app = express();
+
+app.use(miniprofiler.profile());
+
+app.get('/', (req, res) => {
+	res.send();
+});
+
+app.get('/step', (req, res) => {
+  req.miniprofiler.step('Step 1', () => {
+    res.send();
+  });
+});
+
+app.get('/step-two', (req, res) => {
+  req.miniprofiler.step('Step 1', () => {
+    req.miniprofiler.step('Step 2', () => {
+      res.send();
+    });
+  });
+});
+
+module.exports = require('./base.js')(app);

tests/server/index.js

@@ -0,0 +1,16 @@
+var miniprofiler = require('../../lib/miniprofiler.js');
+var express = require('express');
+
+var app = express();
+
+var disableMiniProfiler = (req) => {
+  return false;
+};
+
+app.use(miniprofiler.profile(disableMiniProfiler));
+
+app.get('/', (req, res) => {
+	res.send();
+});
+
+module.exports = require('./base.js')(app);

tests/server/unprofiled.js

@@ -1,37 +1,46 @@
 var expect = require('chai').expect;
-var server = require('./server');
+var server = require('./server/default');
 
 describe('MiniProfiler Share Tests', function() {
   before(server.start);
   after(server.stop);
 
-  it('Valid profiled id should render share page', function(done) {
+  var expectOkResponse = (done) => (err, response, body) => {
+    expect(response.statusCode).to.be.equal(200);
+    expect(response.headers['content-type']).to.be.equal('text/html');
+    done();
+  };
+
+  var expectNotFoundResponse = (done) => (err, response, body) => {
+    expect(response.statusCode).to.be.equal(404);
+    expect(response.headers['content-type']).to.be.equal('text/html');
+    done();
+  };
+
+  it('[GET] Valid profiled id should render share page', function(done) {
     server.get('/', (err, response) => {
       var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
 
-      server.get(`/mini-profiler-resources/results?id=${ids[0]}`, (err, response, body) => {
-        expect(response.statusCode).to.be.equal(200);
-        expect(response.headers['content-type']).to.be.equal('text/html');
-        done();
-      });
+      server.get(`/mini-profiler-resources/results?id=${ids[0]}`, expectOkResponse(done));
 
     });
   });
 
-  it('Invalid profiled id should render 404', function(done) {
-    server.get(`/mini-profiler-resources/results?id=123`, (err, response, body) => {
-      expect(response.statusCode).to.be.equal(404);
-      expect(response.headers['content-type']).to.be.equal('text/html');
-      done();
+  it('[POST] Valid profiled id should render share page', function(done) {
+    server.get('/', (err, response) => {
+      var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
+
+      server.post('/mini-profiler-resources/results', { id: ids[0] }, expectOkResponse(done));
+
     });
   });
 
-  it('Invalid profiled id should render 404', function(done) {
-    server.post(`/mini-profiler-resources/results`, { id: 123 }, (err, response, body) => {
-      expect(response.statusCode).to.be.equal(404);
-      expect(response.headers['content-type']).to.be.equal('text/html');
-      done();
-    });
+  it('[GET] Invalid profiled id should render 404', function(done) {
+    server.get('/mini-profiler-resources/results?id=123', expectNotFoundResponse(done));
+  });
+
+  it('[POST] Invalid profiled id should render 404', function(done) {
+    server.post('/mini-profiler-resources/results', { id: 123 }, expectNotFoundResponse(done));
   });
 
 });

tests/share-test.js

@@ -1,5 +1,5 @@
 var expect = require('chai').expect;
-var server = require('./server');
+var server = require('./server/default');
 
 describe('MiniProfiler Step Tests', function() {
   before(server.start);

tests/step-test.js

@@ -0,0 +1,14 @@
+var expect = require('chai').expect;
+var server = require('./server/unprofiled');
+
+describe('MiniProfiler Unprofiled Tests', function() {
+  before(server.start);
+  after(server.stop);
+
+  it('Unprofiled route should not return Profiler ID', function(done) {
+    server.get('/', (err, response) => {
+      expect(response.headers).to.not.include.keys('x-miniprofiler-ids');
+      done();
+    });
+  });
+});