From 7cf899b3024b95d4f30d602905f50c2ec5de6c61 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Tue, 15 Aug 2023 00:12:38 -0400 Subject: [PATCH] Fix tests --- app/controllers/api/databases.php | 2 +- .../e2e/Services/Databases/DatabasesConsoleClientTest.php | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 0e0bb24f99..1c46c3b2c3 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -3882,7 +3882,7 @@ App::get('/v1/databases/:databaseId/slow-queries') $queries = Query::parseQueries($queries); $queries[] = Query::equal('databaseId', [$databaseId]); - $cursor = Query::getByType($queries, Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE); + $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]); $cursor = reset($cursor); if ($cursor) { $documentId = $cursor->getValue(); diff --git a/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php b/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php index 3f37f027b7..2fce38bf6b 100644 --- a/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php +++ b/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php @@ -367,7 +367,7 @@ class DatabasesConsoleClientTest extends Scope /** * @depends testTimeoutCollection */ - public function testTimeouts(array $data): void + public function testTimeouts(array $data): array { for ($i = 0; $i <= 1; $i++) { $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/collections/' . $data['$id'] . '/documents', array_merge([ @@ -403,10 +403,12 @@ class DatabasesConsoleClientTest extends Scope $this->assertEquals(408, $docs[3]['headers']['status-code']); // update $this->assertEquals(403, $docs[4]['headers']['status-code']); // update $this->assertEquals(403, $docs[5]['headers']['status-code']); // blocked + + return $data; } /** - * @depends testTimeoutCollection + * @depends testTimeouts */ public function testConsoleTimeouts($data): void { @@ -424,7 +426,7 @@ class DatabasesConsoleClientTest extends Scope $this->assertEquals(200, $documents['headers']['status-code']); $this->assertEquals(1, $documents['body']['total']); $this->assertEquals(true, $documents['body']['documents'][0]['blocked']); - $this->assertEquals(2, $documents['body']['documents'][0]['count']); + $this->assertEquals(5, $documents['body']['documents'][0]['count']); $doc = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/slow-queries/' . $documents['body']['documents'][0]['$id'], array_merge([ 'content-type' => 'application/json',