From 1ef0c1adac5f16b441a65475f22f1a219014cf5f Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 22 Jun 2024 20:07:46 +0100 Subject: [PATCH] Fixed tests! And added more!! Signed-off-by: snipe --- tests/Feature/Users/Api/DeleteUserTest.php | 17 +++++++++++++++-- tests/Feature/Users/Ui/DeleteUserTest.php | 10 ++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/tests/Feature/Users/Api/DeleteUserTest.php b/tests/Feature/Users/Api/DeleteUserTest.php index 835a410dad..2bd274d771 100644 --- a/tests/Feature/Users/Api/DeleteUserTest.php +++ b/tests/Feature/Users/Api/DeleteUserTest.php @@ -109,14 +109,24 @@ class DeleteUserTest extends TestCase $this->actingAsForApi($userFromA) ->deleteJson(route('api.users.destroy', ['user' => $userFromB->id])) - ->assertStatus(403) + ->assertOk() + ->assertStatus(200) + ->assertStatusMessageIs('error') ->json(); + $userFromB->refresh(); + $this->assertNull($userFromB->deleted_at); + $this->actingAsForApi($userFromB) ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id])) - ->assertStatus(403) + ->assertOk() + ->assertStatus(200) + ->assertStatusMessageIs('error') ->json(); + $userFromA->refresh(); + $this->assertNull($userFromA->deleted_at); + $this->actingAsForApi($superuser) ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id])) ->assertOk() @@ -124,6 +134,9 @@ class DeleteUserTest extends TestCase ->assertStatusMessageIs('success') ->json(); + $userFromA->refresh(); + $this->assertNotNull($userFromA->deleted_at); + } public function testUsersCannotDeleteThemselves() diff --git a/tests/Feature/Users/Ui/DeleteUserTest.php b/tests/Feature/Users/Ui/DeleteUserTest.php index 2d4a7bdc51..da4c5a37ee 100644 --- a/tests/Feature/Users/Ui/DeleteUserTest.php +++ b/tests/Feature/Users/Ui/DeleteUserTest.php @@ -65,18 +65,28 @@ class DeleteUserTest extends TestCase ->assertStatus(403); $this->followRedirects($response)->assertSee('sad-panda.png'); + $userFromB->refresh(); + $this->assertNull($userFromB->deleted_at); + + $response = $this->actingAs($userFromB) ->delete(route('users.destroy', ['user' => $userFromA->id])) ->assertStatus(302) ->assertRedirect(route('users.index')); $this->followRedirects($response)->assertSee('sad-panda.png'); + $userFromA->refresh(); + $this->assertNull($userFromA->deleted_at); + $response = $this->actingAs($superuser) ->delete(route('users.destroy', ['user' => $userFromA->id])) ->assertStatus(302) ->assertRedirect(route('users.index')); $this->followRedirects($response)->assertSee('Success'); + $userFromA->refresh(); + $this->assertNotNull($userFromA->deleted_at); + }