TheThing/koa-lite
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #434 from koajs/non-error

Browse source 
non-error thrown, fixed #432
This commit is contained in:
Yiyu He 2015-04-14 11:53:16 +08:00
commit bb5ecd325c
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/context.js
View file

@ -7,7 +7,6 @@ var createError = require('http-errors');
var httpAssert = require('http-assert'); var httpAssert = require('http-assert');
var delegate = require('delegates'); var delegate = require('delegates');
var statuses = require('statuses'); var statuses = require('statuses');
var assert = require('assert');
/** /**
* Context prototype. * Context prototype.
@ -103,7 +102,7 @@ var proto = module.exports = {
// to node-style callbacks. // to node-style callbacks.
if (null == err) return; if (null == err) return;
assert(err instanceof Error, 'non-error thrown: ' + err); if (!(err instanceof Error)) err = new Error('non-error thrown: ' + err);
// delegate // delegate
this.app.emit('error', err, this); this.app.emit('error', err, this);

18
test/context/onerror.js
View file

@ -93,4 +93,22 @@ describe('ctx.onerror(err)', function(){
}) })
}) })
}) })
describe('when non-error thrown', function(){
it('should response non-error thrown message', function(done){
var app = koa();
app.use(function *(next){
throw 'string error';
})
var server = app.listen();
request(server)
.get('/')
.expect(500)
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Internal Server Error', done);
})
})
}) })