feat(http): add query parameter to route testing utilities

Author: innocenzi

src/Tempest/Framework/Testing/Http/HttpRouterTester.php

@@ -13,7 +13,7 @@
 use Tempest\Http\Request;
 use Tempest\Router\RouteConfig;
 use Tempest\Router\Router;
-use Tempest\Validation\Validator;
+use Tempest\Support\Uri;
 
 use function Tempest\map;
 
@@ -25,108 +25,108 @@ public function __construct(
         private Container $container,
     ) {}
 
-    public function get(string $uri, array $headers = []): TestResponseHelper
+    public function get(string $uri, array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::GET,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: [],
                 headers: $headers,
             ),
         );
     }
 
-    public function head(string $uri, array $headers = []): TestResponseHelper
+    public function head(string $uri, array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::HEAD,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: [],
                 headers: $headers,
             ),
         );
     }
 
-    public function post(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function post(string $uri, array $body = [], array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::POST,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: $body,
                 headers: $headers,
             ),
         );
     }
 
-    public function put(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function put(string $uri, array $body = [], array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::PUT,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: $body,
                 headers: $headers,
             ),
         );
     }
 
-    public function delete(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function delete(string $uri, array $body = [], array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::DELETE,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: $body,
                 headers: $headers,
             ),
         );
     }
 
-    public function connect(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function connect(string $uri, array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::CONNECT,
-                uri: $uri,
-                body: $body,
+                uri: Uri\merge_query($uri, ...$query),
+                body: [],
                 headers: $headers,
             ),
         );
     }
 
-    public function options(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function options(string $uri, array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::OPTIONS,
-                uri: $uri,
-                body: $body,
+                uri: Uri\merge_query($uri, ...$query),
+                body: [],
                 headers: $headers,
             ),
         );
     }
 
-    public function trace(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function trace(string $uri, array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::TRACE,
-                uri: $uri,
-                body: $body,
+                uri: Uri\merge_query($uri, ...$query),
+                body: [],
                 headers: $headers,
             ),
         );
     }
 
-    public function patch(string $uri, array $body = [], array $headers = []): TestResponseHelper
+    public function patch(string $uri, array $body = [], array $query = [], array $headers = []): TestResponseHelper
     {
         return $this->sendRequest(
             new GenericRequest(
                 method: Method::PATCH,
-                uri: $uri,
+                uri: Uri\merge_query($uri, ...$query),
                 body: $body,
                 headers: $headers,
             ),
@@ -142,6 +142,7 @@ public function sendRequest(Request $request): TestResponseHelper
 
         return new TestResponseHelper(
             response: $router->dispatch(map($request)->with(RequestToPsrRequestMapper::class)->do()),
+            request: $request,
             container: $this->container,
         );
     }

src/Tempest/Framework/Testing/Http/TestResponseHelper.php

@@ -12,6 +12,7 @@
 use Tempest\Container\Container;
 use Tempest\Cryptography\Encryption\Encrypter;
 use Tempest\Http\Cookie\Cookie;
+use Tempest\Http\Request;
 use Tempest\Http\Response;
 use Tempest\Http\Responses\Invalid;
 use Tempest\Http\Session\Session;
@@ -22,13 +23,13 @@
 use Tempest\View\View;
 use Tempest\View\ViewRenderer;
 
-use function Tempest\get;
 use function Tempest\Support\arr;
 
 final class TestResponseHelper
 {
     public function __construct(
         private(set) Response $response,
+        private(set) Request $request,
         private(set) ?Container $container = null,
     ) {}
 

tests/Integration/Testing/Http/HttpRouterTesterIntegrationTest.php

@@ -164,4 +164,18 @@ public function test_patch_requests_failure(): void
             ->patch('/this-route-does-not-exist')
             ->assertOk();
     }
+
+    public function test_query(): void
+    {
+        $this->assertSame($this->http->get('/test?foo=baz', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->get('/test?jon=doe', query: ['foo' => 'bar'])->request->uri, '/test?jon=doe&foo=bar');
+        $this->assertSame($this->http->get('/test?jon=doe', query: ['foo' => ['bar' => 'baz']])->request->uri, '/test?jon=doe&foo%5Bbar%5D=baz');
+
+        $this->assertSame($this->http->get('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->post('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->put('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->delete('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->patch('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+        $this->assertSame($this->http->head('/test', query: ['foo' => 'bar'])->request->uri, '/test?foo=bar');
+    }
 }