From 94589401567904d67fcb020db4b4d9d86138fdf6 Mon Sep 17 00:00:00 2001 From: Lloric Mayuga Garcia Date: Sun, 16 Oct 2022 09:57:32 +0800 Subject: [PATCH] Dont use `route` on test Signed-off-by: Lloric Mayuga Garcia --- tests/Auth/Authorization/BaseRole.php | 10 ++---- tests/Auth/Authorization/ManageTest.php | 25 +++++++------- .../Auth/Authorization/RoleManagementTest.php | 34 ++++--------------- tests/Auth/User/BasicResourceFailedTest.php | 8 +++-- tests/Auth/User/BasicResourceSuccessTest.php | 17 +++++----- tests/Auth/User/DeleteResourceFailedTest.php | 12 +++++-- tests/Auth/User/DeleteResourceSuccessTest.php | 12 +++++-- tests/Auth/User/UserProfileTest.php | 2 +- tests/Auth/User/UserValidationTest.php | 2 +- 9 files changed, 57 insertions(+), 65 deletions(-) diff --git a/tests/Auth/Authorization/BaseRole.php b/tests/Auth/Authorization/BaseRole.php index 7febf13..78545fd 100644 --- a/tests/Auth/Authorization/BaseRole.php +++ b/tests/Auth/Authorization/BaseRole.php @@ -26,19 +26,13 @@ trait BaseRole * @param string $assert */ protected function showModelWithRelation( - string $routeName, - Model $modelShow, + string $url, Model $modelRelation, string $relation, string $assert = 'seeJson' ) { $this->get( - route( - $routeName, - [ - 'id' => self::forId($modelShow), - ] - )."?include=$relation", + $url."?include=$relation", $this->addHeaders() ); $this->assertResponseOk(); diff --git a/tests/Auth/Authorization/ManageTest.php b/tests/Auth/Authorization/ManageTest.php index bcab4e0..74f26e8 100644 --- a/tests/Auth/Authorization/ManageTest.php +++ b/tests/Auth/Authorization/ManageTest.php @@ -19,11 +19,10 @@ it('assign role to user', function () { $user = UserFactory::new()->create(); $role = $this->createRole(); - - $this->showModelWithRelation('backend.users.show', $user, $role, 'roles', 'dontSeeJson'); + $this->showModelWithRelation('auth/users/'. self::forId($user), $role, 'roles', 'dontSeeJson'); post( - route('backend.authorizations.assign-role-to-user').'?include=roles', + 'auth/authorizations/assign-role-to-user?include=roles', [ 'role_id' => self::forId($role), 'user_id' => self::forId($user), @@ -32,7 +31,7 @@ ); assertResponseOk(); - $this->showModelWithRelation('backend.users.show', $user, $role, 'roles'); + $this->showModelWithRelation('auth/users/'. self::forId($user), $role, 'roles'); }); it('revoke role from user', function () { @@ -43,7 +42,7 @@ // $this->showModelWithRelation('backend.users.show', $user, $role, 'roles'); delete( - route('backend.authorizations.revoke-role-from-user').'?include=roles', + 'auth/authorizations/revoke-role-from-user?include=roles', [ 'role_id' => self::forId($role), 'user_id' => self::forId($user), @@ -61,10 +60,10 @@ $user = UserFactory::new()->create(); $permission = $this->createPermission(); - $this->showModelWithRelation('backend.users.show', $user, $permission, 'permissions', 'dontSeeJson'); + $this->showModelWithRelation('auth/users/'. self::forId($user), $permission, 'permissions', 'dontSeeJson'); post( - route('backend.authorizations.assign-permission-to-user').'?include=permissions', + 'auth/authorizations/assign-permission-to-user?include=permissions', [ 'permission_id' => self::forId($permission), 'user_id' => self::forId($user), @@ -73,7 +72,7 @@ ); assertResponseOk(); - $this->showModelWithRelation('backend.users.show', $user, $permission, 'permissions'); + $this->showModelWithRelation('auth/users/'. self::forId($user), $permission, 'permissions'); }); it('revoke permission to user', function () { @@ -86,7 +85,7 @@ // $this->showModelWithRelation('backend.users.show', $user, $permission, 'permissions'); delete( - route('backend.authorizations.revoke-permission-from-user').'?include=permissions', + 'auth/authorizations/revoke-permission-from-user?include=permissions', [ 'permission_id' => self::forId($permission), 'user_id' => self::forId($user), @@ -104,10 +103,10 @@ $role = $this->createRole(); $permission = $this->createPermission(); - $this->showModelWithRelation('backend.roles.show', $role, $permission, 'permissions', 'dontSeeJson'); + $this->showModelWithRelation('auth/roles/'.self::forId($role), $permission, 'permissions', 'dontSeeJson'); post( - route('backend.authorizations.attach-permission-to-role').'?include=permissions', + 'auth/authorizations/attach-permission-to-role?include=permissions', [ 'permission_id' => self::forId($permission), 'role_id' => self::forId($role), @@ -116,7 +115,7 @@ ); assertResponseOk(); - $this->showModelWithRelation('backend.roles.show', $role, $permission, 'permissions'); + $this->showModelWithRelation('auth/roles/'.self::forId($role), $permission, 'permissions'); }); it('revoke permission from role', function () { @@ -127,7 +126,7 @@ // $this->showModelWithRelation('backend.roles.show', $role, $permission, 'permissions'); delete( - route('backend.authorizations.revoke-permission-from-role').'?include=permissions', + 'auth/authorizations/revoke-permission-from-role?include=permissions', [ 'permission_id' => self::forId($permission), 'role_id' => self::forId($role), diff --git a/tests/Auth/Authorization/RoleManagementTest.php b/tests/Auth/Authorization/RoleManagementTest.php index 28a54a1..41555ff 100644 --- a/tests/Auth/Authorization/RoleManagementTest.php +++ b/tests/Auth/Authorization/RoleManagementTest.php @@ -19,16 +19,11 @@ ]; switch ($routeName) { case 'store': - post(route($route), $paramNoData, $this->addHeaders()); + post('auth/roles', $paramNoData, $this->addHeaders()); break; case 'update': put( - route( - $route, - [ - 'id' => self::forId($this->createRole()), - ] - ), + 'auth/roles/'.self::forId($this->createRole()), $paramNoData, $this->addHeaders() ); @@ -49,12 +44,7 @@ it('default role not allowed', function ($verbMethod, $routeName) { $this->loggedInAs(); $this->{$verbMethod}( - route( - $routeName, - [ - 'id' => self::forId($this->getByRoleName('system')), - ] - ), + 'auth/roles/'.self::forId($this->getByRoleName('system')), $verbMethod == 'delete' ? [] : ['name' => $this->getByRoleName('system')->name], $this->addHeaders() ); @@ -76,7 +66,7 @@ $data = [ 'name' => 'test new role', ]; - post(route('backend.roles.store'), $data, $this->addHeaders()); + post('auth/roles', $data, $this->addHeaders()); assertResponseStatus(201); seeJson($data); @@ -93,12 +83,7 @@ ]; put( - route( - 'backend.roles.update', - [ - 'id' => self::forId($role), - ] - ), + 'auth/roles/'.self::forId($role), $data, $this->addHeaders() ); @@ -120,12 +105,7 @@ ]; put( - route( - 'backend.roles.update', - [ - 'id' => self::forId($role), - ] - ), + 'auth/roles/'.self::forId($role), $data, $this->addHeaders() ); @@ -147,7 +127,7 @@ $data = [ 'name' => $roleNameTest, ]; - post(route('backend.roles.store'), $data, $this->addHeaders()); + post('auth/roles', $data, $this->addHeaders()); assertResponseStatus(422); seeJson( diff --git a/tests/Auth/User/BasicResourceFailedTest.php b/tests/Auth/User/BasicResourceFailedTest.php index f50e0f4..1af91aa 100644 --- a/tests/Auth/User/BasicResourceFailedTest.php +++ b/tests/Auth/User/BasicResourceFailedTest.php @@ -8,7 +8,11 @@ it('cannot_delete_self', function () { $user = $this->loggedInAs(); - $this->delete(route('backend.users.destroy', ['id' => self::forId($user)]), [], $this->addHeaders()); + $this->delete( + 'auth/users/'. self::forId($user), + [], + $this->addHeaders() + ); assertResponseStatus(403); seeJson( @@ -27,6 +31,6 @@ $user->delete(); - get(route('backend.users.show', ['id' => $hashedId]), $this->addHeaders()); + get('auth/users/'.$hashedId, $this->addHeaders()); assertResponseStatus(404); }); diff --git a/tests/Auth/User/BasicResourceSuccessTest.php b/tests/Auth/User/BasicResourceSuccessTest.php index 219323a..554dd67 100644 --- a/tests/Auth/User/BasicResourceSuccessTest.php +++ b/tests/Auth/User/BasicResourceSuccessTest.php @@ -14,7 +14,7 @@ it('store user', function () { $this->loggedInAs(); - post(route('backend.users.store'), $this->userData(), $this->addHeaders()); + post('auth/users', $this->userData(), $this->addHeaders()); assertResponseStatus(201); $data = $this->userData(); @@ -30,7 +30,7 @@ $user = UserFactory::new()->create(); put( - route('backend.users.update', ['id' => self::forId($user)]), + 'auth/users/'.self::forId($user), $this->userData(), $this->addHeaders() ); @@ -48,7 +48,11 @@ $user = UserFactory::new()->create(); - delete(route('backend.users.destroy', ['id' => self::forId($user)]), [], $this->addHeaders()); + delete( + 'auth/users/'.self::forId($user), + [], + $this->addHeaders() + ); assertResponseStatus(204); notSeeInDatabase( @@ -65,12 +69,7 @@ $user = UserFactory::new()->create($this->userData()); get( - route( - 'backend.users.show', - [ - 'id' => self::forId($user), - ] - ), + 'auth/users/'.self::forId($user), $this->addHeaders() ); diff --git a/tests/Auth/User/DeleteResourceFailedTest.php b/tests/Auth/User/DeleteResourceFailedTest.php index 882016a..64d7168 100644 --- a/tests/Auth/User/DeleteResourceFailedTest.php +++ b/tests/Auth/User/DeleteResourceFailedTest.php @@ -15,7 +15,11 @@ $user = UserFactory::new()->create(); - delete(route('backend.users.purge', ['id' => self::forId($user)]), [], $this->addHeaders()); + delete( + 'auth/users/'.self::forId($user).'/purge', + [], + $this->addHeaders() + ); assertResponseStatus(404); }); @@ -25,6 +29,10 @@ $user = UserFactory::new()->create(); - put(route('backend.users.restore', ['id' => self::forId($user)]), [], $this->addHeaders()); + put( + 'auth/users/'.self::forId($user).'/restore', + [], + $this->addHeaders() + ); assertResponseStatus(404); }); diff --git a/tests/Auth/User/DeleteResourceSuccessTest.php b/tests/Auth/User/DeleteResourceSuccessTest.php index 19650a8..8ac4988 100644 --- a/tests/Auth/User/DeleteResourceSuccessTest.php +++ b/tests/Auth/User/DeleteResourceSuccessTest.php @@ -17,7 +17,11 @@ $user = UserFactory::new()->create(); $user->delete(); - put(route('backend.users.restore', ['id' => self::forId($user)]), [], $this->addHeaders()); + put( + 'auth/users/'.self::forId($user).'/restore', + [], + $this->addHeaders() + ); assertResponseStatus(200); seeInDatabase( @@ -44,7 +48,11 @@ $user = UserFactory::new()->create(); $user->delete(); - delete(route('backend.users.purge', ['id' => self::forId($user)]), [], $this->addHeaders()); + delete( + 'auth/users/'.self::forId($user).'/purge', + [], + $this->addHeaders() + ); assertResponseStatus(204); notSeeInDatabase( diff --git a/tests/Auth/User/UserProfileTest.php b/tests/Auth/User/UserProfileTest.php index d272a40..83604d1 100644 --- a/tests/Auth/User/UserProfileTest.php +++ b/tests/Auth/User/UserProfileTest.php @@ -18,7 +18,7 @@ ] )->toArray(); } - get(route('frontend.users.profile'), $this->addHeaders()); + get('profile', $this->addHeaders()); if ( ! empty($roleName)) { seeJson($userData); diff --git a/tests/Auth/User/UserValidationTest.php b/tests/Auth/User/UserValidationTest.php index b68fc08..f8199f5 100644 --- a/tests/Auth/User/UserValidationTest.php +++ b/tests/Auth/User/UserValidationTest.php @@ -28,7 +28,7 @@ ); put( - route('backend.users.update', ['id' => self::forId($user)]), + 'auth/users/'.self::forId($user), [ 'email' => $uniqueEmail, ],