fix tests - they have to be async!
This commit is contained in:
parent
cd3971cc03
commit
9da158f945
@ -2,6 +2,8 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
var vows = require('vows')
|
var vows = require('vows')
|
||||||
, assert = require('assert')
|
, assert = require('assert')
|
||||||
|
, util = require('util')
|
||||||
|
, EE = require('events').EventEmitter
|
||||||
, levels = require('../lib/levels');
|
, levels = require('../lib/levels');
|
||||||
|
|
||||||
function MockLogger() {
|
function MockLogger() {
|
||||||
@ -37,15 +39,19 @@ function MockRequest(remoteAddr, method, originalUrl, headers) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function MockResponse() {
|
function MockResponse() {
|
||||||
|
var r = this;
|
||||||
this.end = function(chunk, encoding) {
|
this.end = function(chunk, encoding) {
|
||||||
|
setImmediate(function(){ r.emit('finish') });
|
||||||
};
|
};
|
||||||
|
|
||||||
this.writeHead = function(code, headers) {
|
this.writeHead = function(code, headers) {
|
||||||
|
this.statusCode = code;
|
||||||
|
this._headers = headers;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
util.inherits(MockResponse, EE);
|
||||||
|
|
||||||
function request(cl, method, url, code, reqHeaders, resHeaders) {
|
function request(cl, method, url, code, reqHeaders, resHeaders) {
|
||||||
var req = new MockRequest('my.remote.addr', method, url, reqHeaders);
|
var req = new MockRequest('my.remote.addr', method, url, reqHeaders);
|
||||||
var res = new MockResponse();
|
var res = new MockResponse();
|
||||||
@ -81,8 +87,11 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
var cl = clm.connectLogger(ml);
|
var cl = clm.connectLogger(ml);
|
||||||
|
var cb = this.callback;
|
||||||
request(cl, 'GET', 'http://url', 200);
|
request(cl, 'GET', 'http://url', 200);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
|
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
@ -114,11 +123,13 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'log events with non-default level and custom format' : {
|
'log events with non-default level and custom format' : {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, { level: levels.INFO, format: ':method :url' } );
|
var cl = clm.connectLogger(ml, { level: levels.INFO, format: ':method :url' } );
|
||||||
request(cl, 'GET', 'http://url', 200);
|
request(cl, 'GET', 'http://url', 200);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
},
|
cb(null, ml.messages);
|
||||||
|
},10); },
|
||||||
|
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -131,10 +142,13 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'logger with options as string': {
|
'logger with options as string': {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, ':method :url');
|
var cl = clm.connectLogger(ml, ':method :url');
|
||||||
request(cl, 'POST', 'http://meh', 200);
|
request(cl, 'POST', 'http://meh', 200);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
'should use the passed in format': function(messages) {
|
'should use the passed in format': function(messages) {
|
||||||
assert.equal(messages[0].message, 'POST http://meh');
|
assert.equal(messages[0].message, 'POST http://meh');
|
||||||
@ -144,6 +158,7 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'auto log levels': {
|
'auto log levels': {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, { level: 'auto', format: ':method :url' });
|
var cl = clm.connectLogger(ml, { level: 'auto', format: ':method :url' });
|
||||||
request(cl, 'GET', 'http://meh', 200);
|
request(cl, 'GET', 'http://meh', 200);
|
||||||
@ -151,7 +166,9 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
request(cl, 'GET', 'http://meh', 302);
|
request(cl, 'GET', 'http://meh', 302);
|
||||||
request(cl, 'GET', 'http://meh', 404);
|
request(cl, 'GET', 'http://meh', 404);
|
||||||
request(cl, 'GET', 'http://meh', 500);
|
request(cl, 'GET', 'http://meh', 500);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
|
|
||||||
'should use INFO for 2xx': function(messages) {
|
'should use INFO for 2xx': function(messages) {
|
||||||
@ -175,10 +192,13 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'format using a function': {
|
'format using a function': {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, function(req, res, formatFn) { return "I was called"; });
|
var cl = clm.connectLogger(ml, function(req, res, formatFn) { return "I was called"; });
|
||||||
request(cl, 'GET', 'http://blah', 200);
|
request(cl, 'GET', 'http://blah', 200);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
|
|
||||||
'should call the format function': function(messages) {
|
'should call the format function': function(messages) {
|
||||||
@ -189,6 +209,7 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'format that includes request headers': {
|
'format that includes request headers': {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, ':req[Content-Type]');
|
var cl = clm.connectLogger(ml, ':req[Content-Type]');
|
||||||
request(
|
request(
|
||||||
@ -196,7 +217,9 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'GET', 'http://blah', 200,
|
'GET', 'http://blah', 200,
|
||||||
{ 'Content-Type': 'application/json' }
|
{ 'Content-Type': 'application/json' }
|
||||||
);
|
);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
'should output the request header': function(messages) {
|
'should output the request header': function(messages) {
|
||||||
assert.equal(messages[0].message, 'application/json');
|
assert.equal(messages[0].message, 'application/json');
|
||||||
@ -206,6 +229,7 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
'format that includes response headers': {
|
'format that includes response headers': {
|
||||||
topic: function(clm) {
|
topic: function(clm) {
|
||||||
var ml = new MockLogger();
|
var ml = new MockLogger();
|
||||||
|
var cb = this.callback;
|
||||||
ml.level = levels.INFO;
|
ml.level = levels.INFO;
|
||||||
var cl = clm.connectLogger(ml, ':res[Content-Type]');
|
var cl = clm.connectLogger(ml, ':res[Content-Type]');
|
||||||
request(
|
request(
|
||||||
@ -214,7 +238,9 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
null,
|
null,
|
||||||
{ 'Content-Type': 'application/cheese' }
|
{ 'Content-Type': 'application/cheese' }
|
||||||
);
|
);
|
||||||
return ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
|
|
||||||
'should output the response header': function(messages) {
|
'should output the response header': function(messages) {
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
var vows = require('vows')
|
var vows = require('vows')
|
||||||
, assert = require('assert')
|
, assert = require('assert')
|
||||||
|
, util = require('util')
|
||||||
|
, EE = require('events').EventEmitter
|
||||||
, levels = require('../lib/levels');
|
, levels = require('../lib/levels');
|
||||||
|
|
||||||
function MockLogger() {
|
function MockLogger() {
|
||||||
@ -31,13 +33,14 @@ function MockRequest(remoteAddr, method, originalUrl) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function MockResponse(statusCode) {
|
function MockResponse(statusCode) {
|
||||||
|
var r = this;
|
||||||
this.statusCode = statusCode;
|
this.statusCode = statusCode;
|
||||||
|
|
||||||
this.end = function(chunk, encoding) {
|
this.end = function(chunk, encoding) {
|
||||||
|
setImmediate(function(){ r.emit('finish') });
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
util.inherits(MockResponse, EE);
|
||||||
|
|
||||||
vows.describe('log4js connect logger').addBatch({
|
vows.describe('log4js connect logger').addBatch({
|
||||||
'getConnectLoggerModule': {
|
'getConnectLoggerModule': {
|
||||||
@ -61,9 +64,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d){
|
topic: function(d){
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages);
|
||||||
|
},10);
|
||||||
},
|
},
|
||||||
'check message': function(messages){
|
'check message': function(messages){
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -103,9 +109,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d){
|
topic: function(d){
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages){
|
'check message': function(messages){
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -123,9 +132,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -136,9 +148,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -157,9 +172,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d){
|
topic: function(d){
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages){
|
'check message': function(messages){
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -177,9 +195,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -191,9 +212,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -212,9 +236,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d){
|
topic: function(d){
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.png'); // not gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages){
|
'check message': function(messages){
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -232,9 +259,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.gif'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
@ -246,9 +276,12 @@ vows.describe('log4js connect logger').addBatch({
|
|||||||
topic: function(d) {
|
topic: function(d) {
|
||||||
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
var req = new MockRequest('my.remote.addr', 'GET', 'http://url/hoge.jpeg'); // gif
|
||||||
var res = new MockResponse(200);
|
var res = new MockResponse(200);
|
||||||
|
var cb = this.callback;
|
||||||
d.cl(req, res, function() { });
|
d.cl(req, res, function() { });
|
||||||
res.end('chunk', 'encoding');
|
res.end('chunk', 'encoding');
|
||||||
return d.ml.messages;
|
setTimeout(function() {
|
||||||
|
cb(null, d.ml.messages)
|
||||||
|
}, 10);
|
||||||
},
|
},
|
||||||
'check message': function(messages) {
|
'check message': function(messages) {
|
||||||
assert.isArray(messages);
|
assert.isArray(messages);
|
||||||
|
Loading…
Reference in New Issue
Block a user