options.errorHandler and options.pageNotFound use in http.Server, in …

…connect, just use next
expressjs · Sep 12, 2012 · 0268ac2 · 0268ac2
1 parent 4388e29
commit 0268ac2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/coverage.html b/coverage.html
diff --git a/lib/urlrouter.js b/lib/urlrouter.js
@@ -54,12 +54,12 @@ function router(fn, options) {
   options = options || {};
   options.paramsName = options.paramsName || 'params';
   options.pageNotFound = options.pageNotFound || pageNotFound;
-  options.errorHandler = options.errorHandler || '';
+  options.errorHandler = options.errorHandler || errorHandler;
 
   function createMethod(name) {
     var localRoutes = routes[name.toUpperCase()] = [];
     return function (urlpattern, handle) {
-      var middleware = [];
+      var middleware = null;
 
       // slice middleware
       if (arguments.length > 2) {
@@ -100,9 +100,7 @@ function router(fn, options) {
           var routeMiddleware = function (err) {
             var mw = middleware[k++];
             if (err) {
-              var errHandler = options.errorHandler ? options.errorHandler : 
-                                                      next ?  next : 
-                                                              errorHandler;
+              var errHandler = next || options.errorHandler;
               return errHandler(err, req, res);
             } else if (mw) {
               return mw(req, res, routeMiddleware);

diff --git a/lib/utils.js b/lib/utils.js
@@ -90,7 +90,7 @@ exports.createRouter = function (urlpattern) {
  * @api private
  */
 
-exports.flatten = function(arr, ret){
+exports.flatten = function (arr, ret) {
   ret = ret || [];
   var len = arr.length;
   for (var i = 0; i < len; ++i) {

diff --git a/test/urlrouter.js b/test/urlrouter.js
@@ -319,10 +319,10 @@ describe('use connect with options.errorHandler()', function () {
   after(function () {
     app.close();
   });
-  it('should using custom error handler', function (done) {
+  it('should using next first', function (done) {
     app.request().get('/error').end(function (res) {
-      res.should.status(200);
-      res.body.toString().should.equal('oh no, error occurred on /error');
+      res.should.status(500);
+      res.body.toString().should.include('Some more Error');
       done();
     });
   });

diff --git a/test_results.md b/test_results.md
@@ -581,12 +581,12 @@ app.request().get('/error').end(function (res) {
 
 <a name="use-connect-with-optionserrorhandler" />
 # use connect with options.errorHandler()
-should using custom error handler.
+should using next first.
 
 ```js
 app.request().get('/error').end(function (res) {
-  res.should.status(200);
-  res.body.toString().should.equal('oh no, error occurred on /error');
+  res.should.status(500);
+  res.body.toString().should.include('Some more Error');
   done();
 });
 ```