allow returning a response object inside a promise

nlf · nlf · commit e31839834fbc · 2015-05-29T11:48:54.000-07:00
diff --git a/lib/response.js b/lib/response.js
@@ -368,6 +368,10 @@ internals.Response.prototype._prepare = function (data, next) {
             return next(Boom.wrap(source), data);
         }
 
+        if (source instanceof internals.Response) {
+            return source._processPrepare(data, next);
+        }
+
         self._setSource(source);
         self._passThrough();
         self._processPrepare(data, next);
diff --git a/test/response.js b/test/response.js
@@ -857,6 +857,25 @@ describe('Response', function () {
             });
         });
 
+        it('handles promises that resolve (response object)', function (done) {
+
+            var handler = function (request, reply) {
+
+                return reply(Bluebird.resolve(request.generateResponse({ status: 'ok' }).code(201)));
+            };
+
+            var server = new Hapi.Server();
+            server.connection();
+            server.route({ method: 'GET', path: '/', handler: handler });
+
+            server.inject('/', function (res) {
+
+                expect(res.result.status).to.equal('ok');
+                expect(res.statusCode).to.equal(201);
+                done();
+            });
+        });
+
         it('handles promises that reject', function (done) {
 
             var handler = function (request, reply) {
