diff --git a/‎src/connect/connect-example.js‎
Lines changed: 2 additions & 0 deletions b/‎src/connect/connect-example.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/connect/errorHandler.js‎
Lines changed: 8 additions & 0 deletions b/‎src/connect/errorHandler.js‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/connect/hello-test.js‎
Lines changed: 39 additions & 8 deletions b/‎test/connect/hello-test.js‎
Lines changed: 39 additions & 8 deletions
@@ -1,4 +1,5 @@
 "use strict";
+import errorHandler from "./errorHandler";
 import hello from "./hello";
 import nosniff from "./nosniff";
 import assert from "assert";
@@ -7,6 +8,7 @@ import http from "http";
 import fetch from "node-fetch";
 const responseText = "response text";
 var app = connect();
+app.use(errorHandler());
 app.use(nosniff());
 app.use(hello(responseText));
 
 
@@ -0,0 +1,8 @@
+"use strict";
+export default function errorHandler() {
+    return function (err, req, res, next) {
+        console.error(err.stack);
+        res.status(500).send(err.message);
+        next();
+    };
+}
@@ -2,23 +2,45 @@
 "use strict";
 import assert from "power-assert";
 import connect from "connect";
+import errorHandler from "../../src/connect/errorHandler";
 import nosniff from "../../src/connect/nosniff";
 import hello from "../../src/connect/hello";
 import http from "http";
 import fetch from "node-fetch";
 describe("connect", function () {
     var responseText = "test";
     var server;
-    before(function (done) {
-        var app = connect();
-        app.use(nosniff());
-        app.use(hello(responseText));
-        server = http.createServer(app).listen(3000, done);
-    });
-    after(function () {
-        server.close();
+    describe("errorHandler", function () {
+        beforeEach(function (done) {
+            var app = connect();
+            app.use(errorHandler());
+            app.use((req, res, next) => {
+                next(new Error("wrong"));
+            });
+            server = http.createServer(app).listen(3000, done);
+        });
+        afterEach(function () {
+            server && server.close();
+        });
+        it("should return 500 status response", function () {
+            return fetch("http://localhost:3000")
+                .then(res => res.status)
+                .then(status => {
+                    assert(status, 500);
+                });
+        });
+
     });
     describe("hello", function () {
+        beforeEach(function (done) {
+            var app = connect();
+            app.use(errorHandler());
+            app.use(hello(responseText));
+            server = http.createServer(app).listen(3000, done);
+        });
+        afterEach(function () {
+            server && server.close();
+        });
         it("should return response text", function () {
             return fetch("http://localhost:3000")
                 .then(res => res.text())
@@ -28,6 +50,15 @@ describe("connect", function () {
         });
     });
     describe("sniff", function () {
+        beforeEach(function (done) {
+            var app = connect();
+            app.use(nosniff());
+            app.use(hello(responseText));
+            server = http.createServer(app).listen(3000, done);
+        });
+        afterEach(function () {
+            server && server.close();
+        });
         it("should return response has `X-Content-Type-Options` header", function () {
             return fetch("http://localhost:3000")
                 .then(res => {