wip

Author: driesvints

tests/Routing/RoutingRouteTest.php

@@ -1939,28 +1939,6 @@ public function testResponseIsReturned()
         $this->assertNotInstanceOf(JsonResponse::class, $response);
     }
 
-    public function testRouteFlushController()
-    {
-        $container = new Container;
-        $router = $this->getRouter();
-
-        $router->get('count', ActionCountStub::class);
-        $request = Request::create('count', 'GET');
-
-        $response = $router->dispatch($request);
-        $this->assertSame(1, $response->original['invokedCount']);
-        $this->assertSame(1, $response->original['middlewareInvokedCount']);
-
-        $response = $router->dispatch($request);
-        $this->assertSame(2, $response->original['invokedCount']);
-        $this->assertSame(2, $response->original['middlewareInvokedCount']);
-
-        $request->route()->flushController();
-        $response = $router->dispatch($request);
-        $this->assertSame(1, $response->original['invokedCount']);
-        $this->assertSame(1, $response->original['middlewareInvokedCount']);
-    }
-
     public function testJsonResponseIsReturned()
     {
         $router = $this->getRouter();
@@ -1982,14 +1960,17 @@ public function testRouteFlushController()
         $request = Request::create('count', 'GET');
 
         $response = $router->dispatch($request);
-        $this->assertSame(1, (int) $response->getContent());
+        $this->assertSame(1, $response->original['invokedCount']);
+        $this->assertSame(1, $response->original['middlewareInvokedCount']);
 
         $response = $router->dispatch($request);
-        $this->assertSame(2, (int) $response->getContent());
+        $this->assertSame(2, $response->original['invokedCount']);
+        $this->assertSame(2, $response->original['middlewareInvokedCount']);
 
         $request->route()->flushController();
         $response = $router->dispatch($request);
-        $this->assertSame(1, (int) $response->getContent());
+        $this->assertSame(1, $response->original['invokedCount']);
+        $this->assertSame(1, $response->original['middlewareInvokedCount']);
     }
 
     public function testRouteRedirect()