Merge pull request #6843 from MGatner/controller-test-with-body

system/Test/ControllerTestTrait.php

@@ -108,7 +108,7 @@ protected function setUpControllerTestTrait(): void
             $tempUri = Services::uri();
             Services::injectMock('uri', $this->uri);
 
-            $this->withRequest(Services::request($this->appConfig, false)->setBody($this->body));
+            $this->withRequest(Services::request($this->appConfig, false));
 
             // Restore the URI service
             Services::injectMock('uri', $tempUri);
@@ -156,6 +156,7 @@ public function execute(string $method, ...$params)
         }
 
         $response = null;
+        $this->request->setBody($this->body);
 
         try {
             ob_start();

tests/system/Test/ControllerTestTraitTest.php

@@ -13,10 +13,12 @@
 
 use App\Controllers\Home;
 use App\Controllers\NeverHeardOfIt;
+use CodeIgniter\Controller;
 use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use Config\App;
 use Config\Services;
+use Exception;
 use Tests\Support\Controllers\Popcorn;
 
 /**
@@ -241,4 +243,20 @@ public function testRedirectRoute()
             ->execute('toindex');
         $this->assertTrue($result->isRedirect());
     }
+
+    public function testUsesRequestBody()
+    {
+        $this->controller = new class () extends Controller {
+            public function throwsBody(): void
+            {
+                throw new Exception($this->request->getBody());
+            }
+        };
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $this->expectException(Exception::class);
+        $this->expectExceptionMessage('banana');
+
+        $this->withBody('banana')->execute('throwsBody');
+    }
 }