From d6760bfbee296a28a319db10a48c546d9acd449c Mon Sep 17 00:00:00 2001 From: fogelito Date: Sun, 31 Jul 2022 13:07:15 +0300 Subject: [PATCH] fix tests $created and datetime queries --- composer.lock | 8 +++--- .../e2e/Services/Databases/DatabasesBase.php | 27 +++++++++++++++---- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index c72d549044..f5da1b2fc7 100644 --- a/composer.lock +++ b/composer.lock @@ -2056,12 +2056,12 @@ "source": { "type": "git", "url": "https://github.com/utopia-php/database.git", - "reference": "40c2fbaaa20374279b5d0c30bb25f46beeab548a" + "reference": "e30f4e998a8e520c937b8c854f15c3ed28bc9b34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/database/zipball/40c2fbaaa20374279b5d0c30bb25f46beeab548a", - "reference": "40c2fbaaa20374279b5d0c30bb25f46beeab548a", + "url": "https://api.github.com/repos/utopia-php/database/zipball/e30f4e998a8e520c937b8c854f15c3ed28bc9b34", + "reference": "e30f4e998a8e520c937b8c854f15c3ed28bc9b34", "shasum": "" }, "require": { @@ -2112,7 +2112,7 @@ "issues": "https://github.com/utopia-php/database/issues", "source": "https://github.com/utopia-php/database/tree/feat-attr-datetime" }, - "time": "2022-07-28T10:08:02+00:00" + "time": "2022-07-31T09:28:41+00:00" }, { "name": "utopia-php/domains", diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index a66d71cc64..02bb49fa42 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -823,6 +823,23 @@ trait DatabasesBase $this->assertEquals('available', $movies['body']['indexes'][1]['status']); $this->assertEquals('available', $movies['body']['indexes'][2]['status']); + + $releaseWithDate = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/indexes', array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'key' => 'birthDay', + 'type' => 'key', + 'attributes' => ['birthDay'], + ]); + + $this->assertEquals(201, $releaseWithDate['headers']['status-code']); + $this->assertEquals('birthDay', $releaseWithDate['body']['key']); + $this->assertEquals('key', $releaseWithDate['body']['type']); + $this->assertCount(1, $releaseWithDate['body']['attributes']); + $this->assertEquals('birthDay', $releaseWithDate['body']['attributes'][0]); + return $data; } @@ -1408,7 +1425,7 @@ trait DatabasesBase 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'queries' => ['$createdAt.greater(132)'], + 'queries' => ['$createdAt.greater("1976-06-12")'], ]); $this->assertCount(3, $documents['body']['documents']); @@ -1417,7 +1434,7 @@ trait DatabasesBase 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'queries' => ['$createdAt.lesser(132)'], + 'queries' => ['$createdAt.lesser("1976-06-12")'], ]); $this->assertCount(0, $documents['body']['documents']); @@ -1471,10 +1488,10 @@ trait DatabasesBase ], $this->getHeaders()), [ 'queries' => ['birthDay.greater("1960-01-01 10:10:10")'], ]); -var_dump($documents); + $this->assertEquals($documents['headers']['status-code'], 200); - $this->assertEquals(2019, $documents['body']['documents'][0]['releaseYear']); - $this->assertEquals(2017, $documents['body']['documents'][1]['releaseYear']); + $this->assertEquals('1975-06-12 12:12:55.000', $documents['body']['documents'][0]['birthDay']); + $this->assertEquals('1975-06-12 18:12:55.000', $documents['body']['documents'][1]['birthDay']); $this->assertCount(2, $documents['body']['documents']); return [];