diff --git a/tests/e2e/Services/ProjectWebhooks/WebhooksBase.php b/tests/e2e/Services/ProjectWebhooks/WebhooksBase.php index 8e98c8bb48..e852cf093b 100644 --- a/tests/e2e/Services/ProjectWebhooks/WebhooksBase.php +++ b/tests/e2e/Services/ProjectWebhooks/WebhooksBase.php @@ -26,7 +26,16 @@ trait WebhooksBase $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body'])); - }, 120000, 500); + + $function = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId, [ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'], + ]); + + $this->assertEquals(200, $function['headers']['status-code']); + $this->assertEquals($deploymentId, $function['body']['deploymentId'] ?? '', \json_encode($function['body'])); + }, 240000, 500); } /** diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index e837fd1baf..1413a5ffb9 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -1759,6 +1759,11 @@ final class SitesCustomServerTest extends Scope $deployment = $this->getDeployment($siteId, $deploymentId); $this->assertEquals('ready', $deployment['body']['status']); + $this->assertTrue( + \str_contains((string) $deployment['body']['buildLogs'], 'Screenshot capturing finished.') + || \str_contains((string) $deployment['body']['buildLogs'], 'Screenshot capturing failed.'), + 'Screenshot worker did not finish: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT) + ); }, 120000, 500); /** @@ -2340,16 +2345,19 @@ final class SitesCustomServerTest extends Scope $this->assertEquals(202, $deployment['headers']['status-code']); - $deploymentId2 = $deployment['body']['$id']; - $this->assertNotEmpty($deploymentId2); + $cliDeploymentId = $deployment['body']['$id']; + $this->assertNotEmpty($cliDeploymentId); - $deployment = $this->getDeployment($siteId, $deploymentId2); + $deployment = $this->getDeployment($siteId, $cliDeploymentId); $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertGreaterThan(0, $deployment['body']['sourceSize']); $this->assertEquals(0, $deployment['body']['buildSize']); $this->assertEquals($deployment['body']['sourceSize'], $deployment['body']['totalSize']); $this->assertEquals('cli', $deployment['body']['type']); + $this->waitDeploymentReady($siteId, $cliDeploymentId); + $this->waitDeploymentActivated($siteId, $cliDeploymentId); + // create another duplicate deployment with manual trigger $deployment = $this->client->call(Client::METHOD_POST, '/sites/' . $siteId . '/deployments/duplicate', array_merge([ 'content-type' => 'multipart/form-data', @@ -2360,25 +2368,23 @@ final class SitesCustomServerTest extends Scope $this->assertEquals(202, $deployment['headers']['status-code']); - $deploymentId2 = $deployment['body']['$id']; - $this->assertNotEmpty($deploymentId2); + $manualDeploymentId = $deployment['body']['$id']; + $this->assertNotEmpty($manualDeploymentId); - $deployment = $this->getDeployment($siteId, $deploymentId2); + $deployment = $this->getDeployment($siteId, $manualDeploymentId); $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertGreaterThan(0, $deployment['body']['sourceSize']); $this->assertEquals(0, $deployment['body']['buildSize']); $this->assertEquals($deployment['body']['sourceSize'], $deployment['body']['totalSize']); $this->assertEquals('manual', $deployment['body']['type']); - $this->assertEventually(function () use ($siteId, $deploymentId2) { - $site = $this->getSite($siteId); - $this->assertEquals($deploymentId2, $site['body']['deploymentId']); - }, 120000, 500); + $this->waitDeploymentReady($siteId, $manualDeploymentId); + $this->waitDeploymentActivated($siteId, $manualDeploymentId); $response = $proxyClient->call(Client::METHOD_GET, '/not-found'); $this->assertStringContainsString("Index page", (string) $response['body']); - $deployment = $this->getDeployment($siteId, $deploymentId2); + $deployment = $this->getDeployment($siteId, $manualDeploymentId); $this->assertEquals(200, $deployment['headers']['status-code']); $this->assertGreaterThan(0, $deployment['body']['sourceSize']); $this->assertGreaterThan(0, $deployment['body']['buildSize']);