Expose request object in inject(). Closes hapijs#2335

Author: Eran Hammer

API.md

@@ -1023,11 +1023,13 @@ for performing injections, with some additional options and response properties:
         - `payload` - the response payload string.
         - `rawPayload` - the raw response payload buffer.
         - `raw` - an object with the injection request and response objects:
-            - `req` - the [request object](#request-object).
-            - `res` - the response object.
-        - `result` - the raw handler response (e.g. when not a stream) before it is serialized for
-          transmission. If not available, set to `payload`. Useful for inspection and reuse of the
-          internal objects returned (instead of parsing the response string).
+            - `req` - the simulated node request object.
+            - `res` - the simulated node response object.
+        - `result` - the raw handler response (e.g. when not a stream or a view) before it is
+          serialized for transmission. If not available, the value is set to `payload`. Useful for
+          inspection and reuse of the internal objects returned (instead of parsing the response
+          string).
+        - `request` - the [request object](#request-object).
 
 When the server contains more than one connection, each [`server.connections`](#serverconnections)
 array member provides its own `connection.inject()`.

lib/connection.js

@@ -239,9 +239,11 @@ internals.Connection.prototype.inject = function (options, callback) {
 
         if (res.raw.res._hapi) {
             res.result = res.raw.res._hapi.result;
+            res.request = res.raw.res._hapi.request;
             delete res.raw.res._hapi;
         }
-        else {
+
+        if (res.result === undefined) {
             res.result = res.payload;
         }
 

lib/transmit.js

@@ -316,10 +316,14 @@ internals.transmit = function (response, callback) {
 
     // Injection
 
-    if (response.variety === 'plain' &&
-        Shot.isInjection(request.raw.req)) {
+    if (Shot.isInjection(request.raw.req)) {
+        request.raw.res._hapi = {
+            request: request
+        };
 
-        request.raw.res._hapi = { result: response._isPayloadSupported() ? response.source : null };
+        if (response.variety === 'plain') {
+            request.raw.res._hapi.result = response._isPayloadSupported() ? response.source : null;
+        }
     }
 };
 

test/connection.js

@@ -601,6 +601,26 @@ describe('Connection', function () {
                 done();
             });
         });
+
+        it('returns the request object', function (done) {
+
+            var handler = function (request, reply) {
+
+                request.app.key = 'value';
+                return reply();
+            };
+
+            var server = new Hapi.Server();
+            server.connection();
+            server.route({ method: 'GET', path: '/', config: { handler: handler } });
+
+            server.inject('/', function (res) {
+
+                expect(res.statusCode).to.equal(200);
+                expect(res.request.app.key).to.equal('value');
+                done();
+            });
+        });
     });
 
     describe('table()', function () {