From 2a4ef0635581ed26f930c6f661df5d73d0505da5 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 6 Feb 2026 17:24:57 +1300 Subject: [PATCH] fix: Make Sites tests parallel-safe for --functional mode Add search filters to isolate test data in testListSites to prevent count assertions from failing when other test methods create sites during parallel execution. Co-Authored-By: Claude Opus 4.5 --- .../e2e/Services/Sites/SitesCustomServerTest.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index fd663f9e1b..45388bc4a7 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -659,8 +659,9 @@ class SitesCustomServerTest extends Scope $this->assertEquals($sites['headers']['status-code'], 200); $this->assertCount(1, $sites['body']['sites']); - // Test pagination offset + // Test pagination offset with search filter (to only count our test site) $sites = $this->listSites([ + 'search' => 'Test List Sites', 'queries' => [ Query::offset(1)->toString(), ], @@ -669,8 +670,9 @@ class SitesCustomServerTest extends Scope $this->assertEquals($sites['headers']['status-code'], 200); $this->assertCount(0, $sites['body']['sites']); - // Test filter enabled + // Test filter enabled (with search to isolate our test site) $sites = $this->listSites([ + 'search' => 'Test List Sites', 'queries' => [ Query::equal('enabled', [true])->toString(), ], @@ -679,8 +681,9 @@ class SitesCustomServerTest extends Scope $this->assertEquals($sites['headers']['status-code'], 200); $this->assertCount(1, $sites['body']['sites']); - // Test filter disabled + // Test filter disabled (with search to isolate our test site) $sites = $this->listSites([ + 'search' => 'Test List Sites', 'queries' => [ Query::equal('enabled', [false])->toString(), ], @@ -698,9 +701,9 @@ class SitesCustomServerTest extends Scope $this->assertCount(1, $sites['body']['sites']); $this->assertEquals($sites['body']['sites'][0]['$id'], $siteId); - // Test search framework + // Test search by site ID (more specific than framework search) $sites = $this->listSites([ - 'search' => 'other' + 'search' => $siteId ]); $this->assertEquals($sites['headers']['status-code'], 200); @@ -733,6 +736,7 @@ class SitesCustomServerTest extends Scope $this->assertEquals($sites['body']['sites'][1]['name'], 'Test List Sites 2'); $sites1 = $this->listSites([ + 'search' => 'Test List Sites', 'queries' => [ Query::cursorAfter(new Document(['$id' => $sites['body']['sites'][0]['$id']]))->toString(), ], @@ -743,6 +747,7 @@ class SitesCustomServerTest extends Scope $this->assertEquals($sites1['body']['sites'][0]['name'], 'Test List Sites 2'); $sites2 = $this->listSites([ + 'search' => 'Test List Sites', 'queries' => [ Query::cursorBefore(new Document(['$id' => $sites['body']['sites'][1]['$id']]))->toString(), ],