From 74655d52332dd6a63cc6220b3b6f56ef9955f572 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Mon, 13 Jan 2020 19:53:22 +0200 Subject: [PATCH] Updated DB tests --- tests/e2e/Services/Database/DatabaseBase.php | 36 ++++++++++++------- .../Database/DatabaseConsoleClientTest.php | 14 -------- 2 files changed, 24 insertions(+), 26 deletions(-) delete mode 100644 tests/e2e/Services/Database/DatabaseConsoleClientTest.php diff --git a/tests/e2e/Services/Database/DatabaseBase.php b/tests/e2e/Services/Database/DatabaseBase.php index bd9a5c852..02bbfd83a 100644 --- a/tests/e2e/Services/Database/DatabaseBase.php +++ b/tests/e2e/Services/Database/DatabaseBase.php @@ -123,7 +123,9 @@ trait DatabaseBase 'lastName' => 'Jackson', ], ] - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $document2 = $this->client->call(Client::METHOD_POST, '/database/' . $data['moviesId'] . '/documents', array_merge([ @@ -153,7 +155,9 @@ trait DatabaseBase 'lastName' => 'Jackson', ], ] - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $document3 = $this->client->call(Client::METHOD_POST, '/database/' . $data['moviesId'] . '/documents', array_merge([ @@ -177,7 +181,9 @@ trait DatabaseBase 'lastName' => 'Maree Stoermer', ], ], - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $document4 = $this->client->call(Client::METHOD_POST, '/database/' . $data['moviesId'] . '/documents', array_merge([ @@ -186,7 +192,9 @@ trait DatabaseBase ], $this->getHeaders()), [ 'data' => [ 'releaseYear' => 2020, // Missing title, expect an 400 error - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $this->assertEquals($document1['headers']['status-code'], 201); @@ -196,8 +204,8 @@ trait DatabaseBase $this->assertIsArray($document1['body']['$permissions']); $this->assertIsArray($document1['body']['$permissions']['read']); $this->assertIsArray($document1['body']['$permissions']['write']); - $this->assertCount(0, $document1['body']['$permissions']['read']); - $this->assertCount(0, $document1['body']['$permissions']['write']); + $this->assertCount(1, $document1['body']['$permissions']['read']); + $this->assertCount(1, $document1['body']['$permissions']['write']); $this->assertCount(2, $document1['body']['actors']); $this->assertEquals($document2['headers']['status-code'], 201); @@ -207,8 +215,8 @@ trait DatabaseBase $this->assertIsArray($document2['body']['$permissions']); $this->assertIsArray($document2['body']['$permissions']['read']); $this->assertIsArray($document2['body']['$permissions']['write']); - $this->assertCount(0, $document2['body']['$permissions']['read']); - $this->assertCount(0, $document2['body']['$permissions']['write']); + $this->assertCount(1, $document2['body']['$permissions']['read']); + $this->assertCount(1, $document2['body']['$permissions']['write']); $this->assertCount(3, $document2['body']['actors']); $this->assertEquals($document2['body']['actors'][0]['firstName'], 'Tom'); $this->assertEquals($document2['body']['actors'][0]['lastName'], 'Holland'); @@ -224,8 +232,8 @@ trait DatabaseBase $this->assertIsArray($document3['body']['$permissions']); $this->assertIsArray($document3['body']['$permissions']['read']); $this->assertIsArray($document3['body']['$permissions']['write']); - $this->assertCount(0, $document3['body']['$permissions']['read']); - $this->assertCount(0, $document3['body']['$permissions']['write']); + $this->assertCount(1, $document3['body']['$permissions']['read']); + $this->assertCount(1, $document3['body']['$permissions']['write']); $this->assertCount(2, $document3['body']['actors']); $this->assertEquals($document3['body']['actors'][0]['firstName'], 'Tom'); $this->assertEquals($document3['body']['actors'][0]['lastName'], 'Holland'); @@ -441,7 +449,9 @@ trait DatabaseBase 'data' => [ 'name' => 'Thor: Ragnaroc', 'releaseYear' => 2017, - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $id = $document['body']['$uid']; @@ -491,7 +501,9 @@ trait DatabaseBase 'data' => [ 'name' => 'Thor: Ragnarok', 'releaseYear' => 2017, - ] + ], + 'read' => ['user:'.$this->getUser()['$uid']], + 'write' => ['user:'.$this->getUser()['$uid']], ]); $id = $document['body']['$uid']; diff --git a/tests/e2e/Services/Database/DatabaseConsoleClientTest.php b/tests/e2e/Services/Database/DatabaseConsoleClientTest.php deleted file mode 100644 index 62eb2a212..000000000 --- a/tests/e2e/Services/Database/DatabaseConsoleClientTest.php +++ /dev/null @@ -1,14 +0,0 @@ -