Assign pre errors to both pre and preResponses. Closes #3431

hapijs · May 29, 2017 · a270c69 · a270c69
1 parent 98efaef
commit a270c69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/handler.js b/lib/handler.js
@@ -277,7 +277,7 @@ internals.pre = function (pre) {
             }
 
             if (pre.assign) {
-                request.pre[pre.assign] = response.source;
+                request.pre[pre.assign] = (response instanceof Error ? response : response.source);
                 request.preResponses[pre.assign] = response;
             }
 

diff --git a/test/handler.js b/test/handler.js
@@ -1001,7 +1001,13 @@ describe('handler', () => {
                     ],
                     handler: function (request, reply) {
 
-                        return reply('ok');
+                        if (request.pre.before === request.preResponses.before &&
+                            request.pre.before instanceof Error) {
+
+                            return reply('ok');
+                        }
+
+                        return reply(new Error());
                     }
                 }
             });