Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
rudijs committed Mar 3, 2015
2 parents e52d609 + b6a1cd9 commit 4b127c3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 18 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,21 @@
# Changelog
All notable changes to this project will be documented in this file.

## 0.0.19 - 2015-03-03

### Added
- Package dependency updates.
- Unit test updates.

### Deprecated
- Nothing.

### Removed
- Nothing.

### Fixed
- Nothing.

## 0.0.18 - 2014-11-06

### Added
Expand Down
21 changes: 11 additions & 10 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "koa-json-logger",
"version": "0.0.18",
"version": "0.0.19",
"description": "KoaJS HTTP Request/Response/Error JSON format logger",
"repository": {
"type": "git",
Expand All @@ -25,21 +25,22 @@
},
"license": "MIT",
"engines": {
"node": ">=0.11.13"
"node": ">=0.11.16",
"iojs": ">= 1.0.0"
},
"devDependencies": {
"chai": "^1.9.2",
"chai": "^2.1.0",
"coveralls": "^2.11.2",
"istanbul-harmony": "^0.3.0",
"jshint": "^2.5.9",
"koa": "^0.13.0",
"istanbul-harmony": "^0.3.1",
"jshint": "^2.5.10",
"koa": "^0.18.1",
"mocha": "^2.0.1",
"sinon": "^1.11.1",
"supertest": "^0.14.0"
"sinon": "^1.12.1",
"supertest": "^0.15.0"
},
"dependencies": {
"bunyan": "^1.2.1",
"lodash": "^2.4.1",
"bunyan": "^1.2.3",
"lodash": "^3.3.1",
"uuid": "^2.0.1"
}
}
15 changes: 7 additions & 8 deletions test/koa-json-logger.spec.js
Expand Up @@ -78,7 +78,7 @@ describe('JSON Logger middleware', function () {
// response logging
logEntry.res.statusCode.should.equal(200);
should.exist(logEntry.res.responseTime);
logEntry.res.headers['x-powered-by'].should.equal('koa');
logEntry.res.headers['content-type'].should.equal('text/plain; charset=utf-8');

done();
});
Expand Down Expand Up @@ -141,11 +141,11 @@ describe('JSON Logger middleware', function () {
// response logging
logEntry.res.statusCode.should.equal(500);
should.exist(logEntry.res.responseTime);
logEntry.res.headers['x-powered-by'].should.equal('koa');
should.exist(logEntry.res.headers);

// error logging
logEntry.err.message.should.match(/Something\ blew\ up/);
logEntry.err.name.should.equal('Error');
logEntry.err.name.should.equal('InternalServerError');
logEntry.err.stack.should.match(/Something\ blew\ up/);

done();
Expand Down Expand Up @@ -202,11 +202,11 @@ describe('JSON Logger middleware', function () {
// response logging
logEntry.res.statusCode.should.equal(400);
should.exist(logEntry.res.responseTime);
logEntry.res.headers['x-powered-by'].should.equal('koa');
should.exist(logEntry.res.headers);

// error logging
logEntry.err.message.should.equal('Bad URL parameter format');
logEntry.err.name.should.equal('Error');
logEntry.err.name.should.equal('BadRequestError');
logEntry.err.stack.should.match(/Bad\ URL\ parameter\ format/);

done();
Expand Down Expand Up @@ -260,7 +260,7 @@ describe('JSON Logger middleware', function () {
// response logging
logEntry.res.statusCode.should.equal(500);
should.exist(logEntry.res.responseTime);
logEntry.res.headers['x-powered-by'].should.equal('koa');
should.exist(logEntry.res.headers);

// error logging
logEntry.err.message.should.match(/Something\ blew\ up/);
Expand Down Expand Up @@ -324,12 +324,11 @@ describe('JSON Logger middleware', function () {
// response logging
logEntry.res.statusCode.should.equal(500);
should.exist(logEntry.res.responseTime);
logEntry.res.headers['x-powered-by'].should.equal('koa');
logEntry.res.headers['content-type'].should.equal('application/vnd.api+json');

// error logging
logEntry.err.message.should.match(/Something\ blew\ up/);
logEntry.err.name.should.equal('Error');
logEntry.err.name.should.equal('InternalServerError');
logEntry.err.stack.should.match(/Something\ blew\ up/);

done();
Expand Down

0 comments on commit 4b127c3

Please sign in to comment.