From 790276fced51cdc099ef842200d53eeda09a5902 Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Sat, 27 Aug 2022 15:16:37 +1200 Subject: [PATCH] Review test updates --- .../e2e/Services/Databases/DatabasesBase.php | 4 +- .../DatabasesPermissionsMemberTest.php | 6 +++ .../Functions/FunctionsConsoleClientTest.php | 3 +- .../Functions/FunctionsCustomClientTest.php | 2 +- .../Projects/ProjectsConsoleClientTest.php | 2 +- .../Realtime/RealtimeCustomClientTest.php | 5 +-- tests/unit/Auth/AuthTest.php | 42 +++++++++---------- .../unit/Messaging/MessagingChannelsTest.php | 4 +- 8 files changed, 36 insertions(+), 32 deletions(-) diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php index 7121af114a..b99e894e2c 100644 --- a/tests/e2e/Services/Databases/DatabasesBase.php +++ b/tests/e2e/Services/Databases/DatabasesBase.php @@ -1604,8 +1604,8 @@ trait DatabasesBase ], 'permissions' => [ Permission::read(Role::user($this->getUser()['$id'])), - Permission::update(Role::user(ID::custom($this->getUser()['$id']))), - Permission::delete(Role::user(ID::custom($this->getUser()['$id']))), + Permission::update(Role::user($this->getUser()['$id'])), + Permission::delete(Role::user($this->getUser()['$id'])), ] ]); diff --git a/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php b/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php index aedc53854a..59091956b0 100644 --- a/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php +++ b/tests/e2e/Services/Databases/DatabasesPermissionsMemberTest.php @@ -95,6 +95,12 @@ class DatabasesPermissionsMemberTest extends Scope 'users' => 11, 'doconly' => 6, ], + [ + 'permissions' => [Permission::read(Role::users()), Permission::update(Role::users()), Permission::delete(Role::users())], + 'any' => 12, + 'users' => 12, + 'doconly' => 7, + ], ]; } diff --git a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php index 93e59c5112..9f399ca794 100644 --- a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php +++ b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php @@ -7,6 +7,7 @@ use Tests\E2E\Scopes\ProjectCustom; use Tests\E2E\Client; use Tests\E2E\Scopes\SideConsole; use Utopia\Database\ID; +use Utopia\Database\Role; class FunctionsConsoleClientTest extends Scope { @@ -21,7 +22,7 @@ class FunctionsConsoleClientTest extends Scope ], $this->getHeaders()), [ 'functionId' => ID::unique(), 'name' => 'Test', - 'execute' => ["user:{$this->getUser()['$id']}"], + 'execute' => [Role::user($this->getUser()['$id'])->toString()], 'runtime' => 'php-8.0', 'vars' => [ 'funcKey1' => 'funcValue1', diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php index cfc1b3e64a..bc6ef71dad 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php @@ -59,7 +59,7 @@ class FunctionsCustomClientTest extends Scope ], [ 'functionId' => ID::unique(), 'name' => 'Test', - 'execute' => ["user:{$this->getUser()['$id']}"], + 'execute' => [Role::user($this->getUser()['$id'])->toString()], 'runtime' => 'php-8.0', 'vars' => [ 'funcKey1' => 'funcValue1', diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php index 1b0ee751d6..9b270c559f 100644 --- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php +++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php @@ -396,7 +396,7 @@ class ProjectsConsoleClientTest extends Scope 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ 'provider' => 'unknown', - 'appId' => ID::custom('AppId'), + 'appId' => 'AppId', 'secret' => 'Secret', ]); diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php index ed81e843d8..1cd7cd9c90 100644 --- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php +++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php @@ -648,10 +648,7 @@ class RealtimeCustomClientTest extends Scope 'collectionId' => ID::unique(), 'name' => 'Actors', 'permissions' => [ - Permission::read(Role::users()), - Permission::create(Role::users()), - Permission::update(Role::users()), - Permission::delete(Role::users()), + Permission::create(Role::user($this->getUser()['$id'])), ], 'documentSecurity' => true, ]); diff --git a/tests/unit/Auth/AuthTest.php b/tests/unit/Auth/AuthTest.php index 21436c5155..2b03b00c5b 100644 --- a/tests/unit/Auth/AuthTest.php +++ b/tests/unit/Auth/AuthTest.php @@ -371,13 +371,13 @@ class AuthTest extends TestCase $roles = Auth::getRoles($user); $this->assertCount(7, $roles); - $this->assertContains('users', $roles); - $this->assertContains('user:123', $roles); - $this->assertContains('team:abc', $roles); - $this->assertContains('team:abc/administrator', $roles); - $this->assertContains('team:abc/moderator', $roles); - $this->assertContains('team:def', $roles); - $this->assertContains('team:def/guest', $roles); + $this->assertContains(Role::users()->toString(), $roles); + $this->assertContains(Role::user(ID::custom('123')), $roles); + $this->assertContains(Role::team(ID::custom('abc')), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'administrator'), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'moderator'), $roles); + $this->assertContains(Role::team(ID::custom('def')), $roles); + $this->assertContains(Role::team(ID::custom('def'), 'guest'), $roles); } public function testPrivilegedUserRoles(): void @@ -405,13 +405,13 @@ class AuthTest extends TestCase $roles = Auth::getRoles($user); $this->assertCount(5, $roles); - $this->assertNotContains('users', $roles); - $this->assertNotContains('user:123', $roles); - $this->assertContains('team:abc', $roles); - $this->assertContains('team:abc/administrator', $roles); - $this->assertContains('team:abc/moderator', $roles); - $this->assertContains('team:def', $roles); - $this->assertContains('team:def/guest', $roles); + $this->assertNotContains(Role::users()->toString(), $roles); + $this->assertNotContains(Role::user(ID::custom('123')), $roles); + $this->assertContains(Role::team(ID::custom('abc')), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'administrator'), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'moderator'), $roles); + $this->assertContains(Role::team(ID::custom('def')), $roles); + $this->assertContains(Role::team(ID::custom('def'), 'guest'), $roles); } public function testAppUserRoles(): void @@ -439,12 +439,12 @@ class AuthTest extends TestCase $roles = Auth::getRoles($user); $this->assertCount(5, $roles); - $this->assertNotContains('users', $roles); - $this->assertNotContains('user:123', $roles); - $this->assertContains('team:abc', $roles); - $this->assertContains('team:abc/administrator', $roles); - $this->assertContains('team:abc/moderator', $roles); - $this->assertContains('team:def', $roles); - $this->assertContains('team:def/guest', $roles); + $this->assertNotContains(Role::users()->toString(), $roles); + $this->assertNotContains(Role::user(ID::custom('123')), $roles); + $this->assertContains(Role::team(ID::custom('abc')), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'administrator'), $roles); + $this->assertContains(Role::team(ID::custom('abc'), 'moderator'), $roles); + $this->assertContains(Role::team(ID::custom('def')), $roles); + $this->assertContains(Role::team(ID::custom('def'), 'guest'), $roles); } } diff --git a/tests/unit/Messaging/MessagingChannelsTest.php b/tests/unit/Messaging/MessagingChannelsTest.php index 1472961281..b97df78196 100644 --- a/tests/unit/Messaging/MessagingChannelsTest.php +++ b/tests/unit/Messaging/MessagingChannelsTest.php @@ -58,7 +58,7 @@ class MessagingChannelsTest extends TestCase 'roles' => [ empty($index % 2) ? Auth::USER_ROLE_ADMIN - : Role::users()->toString(), + : 'member', ] ] ] @@ -288,7 +288,7 @@ class MessagingChannelsTest extends TestCase ID::custom('team' . $index), (empty($index % 2) ? Auth::USER_ROLE_ADMIN - : Role::users()->toString()) + : 'member') )->toString() ];