Merge remote-tracking branch 'origin/1.6.x' into feat-logs-db

This commit is contained in:
Damodar Lohani 2025-02-06 04:40:05 +00:00
commit 0a6ebe6661
3 changed files with 12 additions and 27 deletions

View file

@ -370,6 +370,8 @@ class Certificates extends Action
/** Trigger Webhook */
$ruleModel = new Rule();
$queueForEvents
->setQueue(Event::WEBHOOK_QUEUE_NAME)
->setClass(Event::WEBHOOK_CLASS_NAME)
->setProject($project)
->setEvent('rules.[ruleId].update')
->setParam('ruleId', $rule->getId())

View file

@ -2,6 +2,7 @@
namespace Tests\E2E\Services\GraphQL;
use Appwrite\Tests\Async;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
@ -14,6 +15,7 @@ class FunctionsClientTest extends Scope
use ProjectCustom;
use SideClient;
use Base;
use Async;
public function testCreateFunction(): array
{
@ -119,7 +121,7 @@ class FunctionsClientTest extends Scope
]
];
while (true) {
$this->assertEventually(function () use ($projectId, $gqlPayload, &$deployment) {
$deployment = $this->client->call(Client::METHOD_POST, '/graphql', [
'content-type' => 'application/json',
'x-appwrite-project' => $projectId,
@ -130,18 +132,8 @@ class FunctionsClientTest extends Scope
$this->assertArrayNotHasKey('errors', $deployment['body']);
$deployment = $deployment['body']['data']['functionsGetDeployment'];
if (
$deployment['status'] === 'ready'
|| $deployment['status'] === 'failed'
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['status']);
$this->assertEquals('ready', $deployment['status']);
});
return $deployment;
}

View file

@ -2,6 +2,7 @@
namespace Tests\E2E\Services\GraphQL;
use Appwrite\Tests\Async;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
@ -14,6 +15,7 @@ class FunctionsServerTest extends Scope
use ProjectCustom;
use SideServer;
use Base;
use Async;
public function testCreateFunction(): array
{
@ -117,7 +119,7 @@ class FunctionsServerTest extends Scope
]
];
while (true) {
$this->assertEventually(function () use ($projectId, $gqlPayload, &$deployment) {
$deployment = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $projectId,
@ -127,19 +129,8 @@ class FunctionsServerTest extends Scope
$this->assertArrayNotHasKey('errors', $deployment['body']);
$deployment = $deployment['body']['data']['functionsGetDeployment'];
if (
$deployment['status'] === 'ready'
|| $deployment['status'] === 'failed'
) {
break;
}
\sleep(1);
}
$this->assertEquals('ready', $deployment['status']);
$this->assertEquals('ready', $deployment['status']);
});
return $deployment;
}