[11.x] Allow TestResponse to accept Illuminate\Http\Request (#47418)

* [11.x] Allow `TestResponse` to accept `Illuminate\Http\Request`

This allows use to make assertion on the request from `TestResponse`

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

* wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>

Author: crynobone

src/Illuminate/Foundation/Testing/Concerns/MakesHttpRequests.php

@@ -570,7 +570,7 @@ public function call($method, $uri, $parameters = [], $cookies = [], $files = []
             $response = $this->followRedirects($response);
         }
 
-        return static::$latestResponse = $this->createTestResponse($response);
+        return static::$latestResponse = $this->createTestResponse($response, $request);
     }
 
     /**
@@ -692,11 +692,12 @@ protected function followRedirects($response)
      * Create the test response instance from the given response.
      *
      * @param  \Illuminate\Http\Response  $response
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Testing\TestResponse
      */
-    protected function createTestResponse($response)
+    protected function createTestResponse($response, $request)
     {
-        return tap(TestResponse::fromBaseResponse($response), function ($response) {
+        return tap(TestResponse::fromBaseResponse($response, $request), function ($response) {
             $response->withExceptions(
                 $this->app->bound(LoggedExceptionCollection::class)
                     ? $this->app->make(LoggedExceptionCollection::class)

src/Illuminate/Testing/TestResponse.php

@@ -37,6 +37,13 @@ class TestResponse implements ArrayAccess
         __call as macroCall;
     }
 
+    /**
+     * The original request.
+     *
+     * @var \Illuminate\Http\Request|null
+     */
+    public $baseRequest;
+
     /**
      * The response to delegate to.
      *
@@ -62,23 +69,26 @@ class TestResponse implements ArrayAccess
      * Create a new test response instance.
      *
      * @param  \Illuminate\Http\Response  $response
+     * @param  \Illuminate\Http\Request|null  $request
      * @return void
      */
-    public function __construct($response)
+    public function __construct($response, $request = null)
     {
         $this->baseResponse = $response;
+        $this->baseRequest = $request;
         $this->exceptions = new Collection;
     }
 
     /**
      * Create a new TestResponse from another response.
      *
      * @param  \Illuminate\Http\Response  $response
+     * @param  \Illuminate\Http\Request|null  $request
      * @return static
      */
-    public static function fromBaseResponse($response)
+    public static function fromBaseResponse($response, $request = null)
     {
-        return new static($response);
+        return new static($response, $request);
     }
 
     /**

tests/Integration/Routing/FallbackRouteTest.php

@@ -55,8 +55,13 @@ public function testFallbackWithWildcards()
         })->where('any', '.*');
 
         $this->assertStringContainsString('one', $this->get('/one')->getContent());
-        $this->assertStringContainsString('wildcard', $this->get('/non-existing')->getContent());
-        $this->assertEquals(200, $this->get('/non-existing')->getStatusCode());
+
+        tap($this->get('/non-existing'), function ($response) {
+            $this->assertStringContainsString('wildcard', $response->getContent());
+            $this->assertEquals(200, $response->getStatusCode());
+
+            $this->assertSame('non-existing', $response->baseRequest->route('any'));
+        });
     }
 
     public function testNoRoutes()

tests/Integration/Routing/ImplicitModelRouteBindingTest.php

@@ -107,6 +107,8 @@ public function testWithoutRouteCachingEnabled()
             'id' => $user->id,
             'name' => $user->name,
         ]);
+
+        $this->assertTrue($user->is($response->baseRequest->route('user')));
     }
 
     public function testSoftDeletedModelsAreNotRetrieved()
@@ -144,6 +146,8 @@ public function testSoftDeletedModelsCanBeRetrievedUsingWithTrashedMethod()
             'id' => $user->id,
             'name' => $user->name,
         ]);
+
+        $this->assertTrue($user->is($response->baseRequest->route('user')));
     }
 
     public function testEnforceScopingImplicitRouteBindings()

tests/Integration/Routing/RouteViewTest.php

@@ -27,8 +27,17 @@ public function testRouteViewWithParams()
         $this->assertStringContainsString('Test bar', $this->get('/route/value1/value2')->getContent());
         $this->assertStringContainsString('Test bar', $this->get('/route/value1')->getContent());
 
-        $this->assertEquals('value1', $this->get('/route/value1/value2')->viewData('param'));
-        $this->assertEquals('value2', $this->get('/route/value1/value2')->viewData('param2'));
+        tap($this->get('/route/value1/value2'), function ($response) {
+            $this->assertEquals('value1', $response->viewData('param'));
+            $this->assertEquals('value1', $response->baseRequest->route('param'));
+            $this->assertEquals('value2', $response->baseRequest->route('param2'));
+        });
+
+        tap($this->get('/route/value1/value2'), function ($response) {
+            $this->assertEquals('value2', $response->viewData('param2'));
+            $this->assertEquals('value1', $response->baseRequest->route('param'));
+            $this->assertEquals('value2', $response->baseRequest->route('param2'));
+        });
     }
 
     public function testRouteViewWithStatus()

tests/Integration/Routing/SimpleRouteTest.php

@@ -16,5 +16,11 @@ public function testSimpleRouteThroughTheFramework()
         $response = $this->get('/');
 
         $this->assertSame('Hello World', $response->content());
+
+        $response = $this->get('/?foo=bar');
+
+        $this->assertSame('Hello World', $response->content());
+
+        $this->assertSame('bar', $response->baseRequest->query('foo'));
     }
 }

tests/Integration/Routing/UrlSigningTest.php

@@ -33,7 +33,12 @@ public function testSigningUrl()
         })->name('foo');
 
         $this->assertIsString($url = URL::signedRoute('foo', ['id' => 1]));
-        $this->assertSame('valid', $this->get($url)->original);
+
+        tap($this->get($url), function ($response) {
+            $this->assertSame('valid', $response->original);
+
+            $this->assertIsString($response->baseRequest->query('signature'));
+        });
     }
 
     public function testSigningUrlWithCustomRouteSlug()
@@ -46,8 +51,13 @@ public function testSigningUrlWithCustomRouteSlug()
         $model->routable = 'routable-slug';
 
         $this->assertIsString($url = URL::signedRoute('foo', ['post' => $model]));
-        $this->assertSame('valid', $this->get($url)->original['valid']);
-        $this->assertSame('routable-slug', $this->get($url)->original['slug']);
+
+        tap($this->get($url), function ($response) {
+            $this->assertSame('valid', $response->original['valid']);
+            $this->assertSame('routable-slug', $response->original['slug']);
+
+            $this->assertSame('routable-slug', $response->baseRequest->route('post'));
+        });
     }
 
     public function testTemporarySignedUrls()