Merge pull request hapijs#432 from wpreul/bug/431

Error responses skip response validation
FrancisVarga · Jan 31, 2013 · 6fbb7f8 · 6fbb7f8
2 parents ffabc33 + 56d80c3
commit 6fbb7f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/validation.js b/lib/validation.js
@@ -99,6 +99,10 @@ exports.response = function (request, next) {
         }
     }
 
+    if (request._response instanceof Error) {
+        return next();
+    }
+
     if (request._response instanceof Response.Obj === false) {
         return next(Err.internal('Cannot validate non-object response'));
     }

diff --git a/test/unit/validation.js b/test/unit/validation.js
@@ -87,6 +87,20 @@ describe('Validation', function () {
             });
         });
 
+        it('an error response should skip response validation and not return an error', function (done) {
+
+            var query = { username: 'walmart' };
+            var request = createRequestObject(query, route);
+
+            request._response = Hapi.Response.generate(Hapi.Error.unauthorized('You are not authorized'));
+
+            Validation.response(request, function (err) {
+
+                expect(err).to.not.exist;
+                done();
+            });
+        });
+
         it('should raise an error when responding with invalid param', function (done) {
 
             var query = { username: 'walmart' };