Merge branch '2.x' into pr/732

Author: pascalbaljet

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: true
       matrix:

src/Response.php

@@ -109,7 +109,7 @@ public function toResponse($request)
             [
                 'component' => $this->component,
                 'props' => $props,
-                'url' => Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/'),
+                'url' => $this->getUrl($request),
                 'version' => $this->version,
                 'clearHistory' => $this->clearHistory,
                 'encryptHistory' => $this->encryptHistory,
@@ -369,4 +369,29 @@ public function isPartial(Request $request): bool
     {
         return $request->header(Header::PARTIAL_COMPONENT) === $this->component;
     }
+
+    /**
+     * Get the URL from the request (without the scheme and host) while preserving the trailing slash if it exists.
+     */
+    protected function getUrl(Request $request): string
+    {
+        $url = Str::start(Str::after($request->fullUrl(), $request->getSchemeAndHttpHost()), '/');
+
+        $rawUri = Str::before($request->getRequestUri(), '?');
+
+        return Str::endsWith($rawUri, '/') ? $this->finishUrlWithTrailingSlash($url) : $url;
+    }
+
+    /**
+     * Ensure the URL has a trailing slash before the query string (if it exists).
+     */
+    protected function finishUrlWithTrailingSlash(string $url): string
+    {
+        // Make sure the relative URL ends with a trailing slash and re-append the query string if it exists.
+        $urlWithoutQueryWithTrailingSlash = Str::finish(Str::before($url, '?'), '/');
+
+        return str_contains($url, '?')
+            ? $urlWithoutQueryWithTrailingSlash.'?'.Str::after($url, '?')
+            : $urlWithoutQueryWithTrailingSlash;
+    }
 }

src/ServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Inertia;
 
-use Illuminate\Foundation\Testing\TestResponse as LegacyTestResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
@@ -99,13 +98,6 @@ protected function registerTestingMacros(): void
             return;
         }
 
-        // Laravel <= 6.0
-        if (class_exists(LegacyTestResponse::class)) {
-            LegacyTestResponse::mixin(new TestResponseMacros);
-
-            return;
-        }
-
         throw new LogicException('Could not detect TestResponse class.');
     }
 

src/Testing/TestResponseMacros.php

@@ -3,6 +3,7 @@
 namespace Inertia\Testing;
 
 use Closure;
+use Illuminate\Support\Arr;
 
 class TestResponseMacros
 {
@@ -27,4 +28,11 @@ public function inertiaPage()
             return AssertableInertia::fromTestResponse($this)->toArray();
         };
     }
+
+    public function inertiaProps()
+    {
+        return function (?string $propName = null) {
+            return Arr::get($this->inertiaPage()['props'], $propName);
+        };
+    }
 }

tests/ResponseTest.php

@@ -866,4 +866,52 @@ public function test_the_page_url_doesnt_double_up(): void
 
         $this->assertSame('/subpath/product/123', $page->url);
     }
+
+    public function test_trailing_slashes_in_a_url_are_preserved(): void
+    {
+        $request = Request::create('/users/', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+
+        $response = new Response('User/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+
+        $this->assertSame('/users/', $page->url);
+    }
+
+    public function test_trailing_slashes_in_a_url_with_query_parameters_are_preserved(): void
+    {
+        $request = Request::create('/users/?page=1&sort=name', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+
+        $response = new Response('User/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+
+        $this->assertSame('/users/?page=1&sort=name', $page->url);
+    }
+
+    public function test_a_url_without_trailing_slash_is_resolved_correctly(): void
+    {
+        $request = Request::create('/users', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+
+        $response = new Response('User/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+
+        $this->assertSame('/users', $page->url);
+    }
+
+    public function test_a_url_without_trailing_slash_and_query_parameters_is_resolved_correctly(): void
+    {
+        $request = Request::create('/users?page=1&sort=name', 'GET');
+        $request->headers->add(['X-Inertia' => 'true']);
+
+        $response = new Response('User/Index', []);
+        $response = $response->toResponse($request);
+        $page = $response->getData();
+
+        $this->assertSame('/users?page=1&sort=name', $page->url);
+    }
 }

tests/Testing/TestResponseMacrosTest.php

@@ -50,4 +50,30 @@ public function test_it_can_retrieve_the_inertia_page(): void
             $this->assertFalse($page['clearHistory']);
         });
     }
+
+    public function test_it_can_retrieve_the_inertia_props(): void
+    {
+        $props = ['bar' => 'baz'];
+        $response = $this->makeMockRequest(
+            Inertia::render('foo', $props)
+        );
+
+        $this->assertSame($props, $response->inertiaProps());
+    }
+
+    public function test_it_can_retrieve_nested_inertia_prop_values_with_dot_notation(): void
+    {
+        $response = $this->makeMockRequest(
+            Inertia::render('foo', [
+                'bar' => ['baz' => 'qux'],
+                'users' => [
+                    ['name' => 'John'],
+                    ['name' => 'Jane'],
+                ],
+            ])
+        );
+
+        $this->assertSame('qux', $response->inertiaProps('bar.baz'));
+        $this->assertSame('John', $response->inertiaProps('users.0.name'));
+    }
 }