timequery test

Author: goenning

examples/express/server.js

@@ -1,7 +1,6 @@
 var miniprofiler = require('../../lib/miniprofiler.js');
 var pg = require('pg');
 var redis = require('redis');
-var redisClient = redis.createClient();
 
 var express = require('express');
 var connString = 'postgres://postgres:postgres@localhost/miniprofiler';
@@ -18,7 +17,20 @@ app.get('/', function(req, res) {
 	res.render('home');
 });
 
+app.get('/js-sleep', function(req, res) {
+	var waitBeforeRender = function(ms) {
+		setTimeout(function() {
+			res.render('home');
+		}, ms());
+	}
+
+	req.miniprofiler.timeQuery('custom', 'Sleeping...', waitBeforeRender, function() {
+		return 300
+	});
+});
+
 app.get('/redis-set-get', function(req, res) {
+	var redisClient = redis.createClient();
   redisClient.set('customer', '[email protected]', function() {
     redisClient.get('key', function(err, reply) {
       res.render('home');
@@ -36,6 +48,7 @@ app.get('/pg-sleep', function(req, res) {
 });
 
 app.get('/all', function(req, res) {
+	var redisClient = redis.createClient();
   req.miniprofiler.step('Waiting 1 second', function() {
 
     pg.connect(connString, function(err, pgClient, done) {

lib/miniprofiler.js

@@ -367,18 +367,21 @@ function timeQuery(extension, type, query, executeFunction) {
 	};
 	extension.stepGraph.customTimings[type].push(customTiming);
 
+	//Do we need this?
+	/*
 	for(var i = 0; i < params.length; i++){
 		var param = params[i];
 		if(_.isFunction(params[i])){
 			params[i] = function() {
-				customTiming.stopTime = process.hrtime();
+				//customTiming.stopTime = process.hrtime();
 
 				var ret = param.apply(this, arguments);
 
 				return ret;
 			};
 		}
 	}
+	*/
 
 	var ret = executeFunction.apply(this, params);
 

tests/basic-test.js

@@ -11,5 +11,27 @@ describe('MiniProfiler Tests', function() {
       done();
     });
   });
-  
+
+  it('Custom timed query should be profiled', function(done) {
+    server.get('/js-sleep', (err, response) => {
+      var ids = JSON.parse(response.headers['x-miniprofiler-ids']);
+      expect(ids).to.have.lengthOf(1);
+
+      server.post('/mini-profiler-resources/results', { id: ids[0], popup: 1 }, (err, response, body) => {
+        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.Root.Children).to.be.empty;
+        expect(result.Root.CustomTimings).to.have.property('custom');
+        expect(result.Root.CustomTimings.custom).to.have.lengthOf(1);
+        expect(result.Root.CustomTimings.custom[0].ExecuteType).to.be.equal('custom')
+        expect(result.Root.CustomTimings.custom[0].CommandString).to.be.equal('Sleeping...')
+        expect(result.Root.CustomTimings.custom[0].DurationMilliseconds).to.be.above(result.DurationMilliseconds);
+        done();
+      });
+    });
+
+  });
+
 });

tests/server/default.js

@@ -23,4 +23,16 @@ app.get('/step-two', (req, res) => {
   });
 });
 
+app.get('/js-sleep', function(req, res) {
+	var waitBeforeRender = function(ms) {
+		setTimeout(function() {
+    	res.send();
+		}, ms());
+	}
+
+	req.miniprofiler.timeQuery('custom', 'Sleeping...', waitBeforeRender, function() {
+		return 300
+	});
+});
+
 module.exports = require('./base.js')(app);