correct events in case of error

lib/application.js

@@ -156,12 +156,18 @@ module.exports = class Application extends Emitter {
  handleRequest(ctx, fnMiddleware) {
  const res = ctx.res;
  res.statusCode = 404;
+
+ const responding = Symbol('responding');
+ this.once(responding, () => this.emit('respond', ctx));
+
  const onerror = err => {
- if (null != err) ctx.onerror(err);
- this.emit('responded', ctx);
+ if (null != err) {
+ ctx.onerror(err);
+ this.emit(responding);
+ } else this.emit('responded', ctx);
  };
  const handleResponse = () => {
- this.emit('respond', ctx);
+ this.emit(responding);
  respond(ctx);
  };
  this.emit('request', ctx);

test/application/events.js

@@ -47,7 +47,7 @@ describe('app emits events', () => {
  it('should emit error event on middleware throw', async() => {
  const app = new Koa();
  const emitted = [];
- app.on('error', err => emitted.push(err));
+ ['request', 'respond', 'responded', 'error'].forEach(event => app.on(event, () => emitted.push(event)));
 
  app.use((ctx, next) => {
  throw new TypeError('Hello Koa!');
@@ -66,8 +66,7 @@ describe('app emits events', () => {
  .get('/')
  .expect(500);
 
- assert.deepStrictEqual(emitted.length, 1);
- assert.ok(emitted[0] instanceof TypeError);
+ assert.deepStrictEqual(emitted, ['request', 'error', 'respond', 'responded']);
  assert.strictEqual(onceEvents, 1);
  });
 });