From fc05a4f1e30e164c54e1330ef2cdcb77cd3cc36b Mon Sep 17 00:00:00 2001
From: Chirag Aggarwal <chiragaggarwal5k@gmail.com>
Date: Mon, 3 Mar 2025 16:07:33 +0000
Subject: [PATCH] chore: updated to use assertEventually

---
 .../Realtime/RealtimeCustomClientTest.php     | 19 ++-----------
 tests/e2e/Services/Webhooks/WebhooksBase.php  | 28 ++++++-------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
index c72dbf85ec..e356397408 100644
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@@ -1311,29 +1311,16 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals($deployment['headers']['status-code'], 202);
         $this->assertNotEmpty($deployment['body']['$id']);
 
-        $maxTimeSeconds = 10;
-        $startTime = time();
         // Poll until deployment is built
-        while (true) {
+        $this->assertEventually(function () use ($function, $deploymentId) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]);
 
-            if (
-                $deployment['headers']['status-code'] >= 400
-                || \in_array($deployment['body']['status'], ['ready', 'failed'])
-            ) {
-                break;
-            }
-
-            if (time() - $startTime >= $maxTimeSeconds) {
-                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
-            }
-
-            \sleep(1);
-        }
+            $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
+        });
 
         $response = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
             'content-type' => 'application/json',
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index ffcb1ce980..b7985b5be1 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -2,6 +2,7 @@
 
 namespace Tests\E2E\Services\Webhooks;
 
+use Appwrite\Tests\Async;
 use Appwrite\Tests\Retry;
 use CURLFile;
 use Tests\E2E\Client;
@@ -12,35 +13,22 @@ use Utopia\Database\Validator\Datetime as DatetimeValidator;
 
 trait WebhooksBase
 {
+    use Async;
+
     protected function awaitDeploymentIsBuilt($functionId, $deploymentId, $checkForSuccess = true): void
     {
-        $maxTimeSeconds = 10;
-        $startTime = time();
-        while (true) {
+        $this->assertEventually(function () use ($functionId, $deploymentId, $checkForSuccess) {
             $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ]);
 
-            if (
-                $deployment['headers']['status-code'] >= 400
-                || \in_array($deployment['body']['status'], ['ready', 'failed'])
-            ) {
-                break;
+            if ($checkForSuccess) {
+                $this->assertEquals(200, $deployment['headers']['status-code']);
+                $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
             }
-
-            if (time() - $startTime >= $maxTimeSeconds) {
-                throw new \Exception('Deployment timed out after ' . $maxTimeSeconds . ' seconds');
-            }
-
-            \sleep(1);
-        }
-
-        if ($checkForSuccess) {
-            $this->assertEquals(200, $deployment['headers']['status-code']);
-            $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
-        }
+        });
     }
 
     public static function getWebhookSignature(array $webhook, string $signatureKey): string