Merge branch '5.1' into 5

2023-12-09 13:24:12 +00:00 · 2023-12-09 13:24:12 +00:00 · d3959630c8
parent 1f1b64f890 8ca2ade623
commit d3959630c8
1 changed files with 5 additions and 1 deletions
--- a/tests/php/Model/SiteTreeTest.php
+++ b/tests/php/Model/SiteTreeTest.php
@ -530,7 +530,11 @@ class SiteTreeTest extends SapphireTest
            $staff->RelativeLink(),
            'Matches URLSegment plus parent on second level without parameters'
        );
-        $this->assertEquals('0/', $numeric0->RelativeLink(), 'Matches URLSegment for segment = 0');
+        $this->assertEquals(
+            Controller::normaliseTrailingSlash('0/'),
+            $numeric0->RelativeLink(),
+            'Matches URLSegment for segment = 0'
+        );
        $this->assertEquals(
            'about-us/edit',
            $about->RelativeLink('edit'),