Fixed tests! And added more!!

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-06-22 20:07:46 +01:00
parent c2e649e2bf
commit 1ef0c1adac
2 changed files with 25 additions and 2 deletions

View file

@ -109,14 +109,24 @@ class DeleteUserTest extends TestCase
$this->actingAsForApi($userFromA) $this->actingAsForApi($userFromA)
->deleteJson(route('api.users.destroy', ['user' => $userFromB->id])) ->deleteJson(route('api.users.destroy', ['user' => $userFromB->id]))
->assertStatus(403) ->assertOk()
->assertStatus(200)
->assertStatusMessageIs('error')
->json(); ->json();
$userFromB->refresh();
$this->assertNull($userFromB->deleted_at);
$this->actingAsForApi($userFromB) $this->actingAsForApi($userFromB)
->deleteJson(route('api.users.destroy', ['user' => $userFromA->id])) ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
->assertStatus(403) ->assertOk()
->assertStatus(200)
->assertStatusMessageIs('error')
->json(); ->json();
$userFromA->refresh();
$this->assertNull($userFromA->deleted_at);
$this->actingAsForApi($superuser) $this->actingAsForApi($superuser)
->deleteJson(route('api.users.destroy', ['user' => $userFromA->id])) ->deleteJson(route('api.users.destroy', ['user' => $userFromA->id]))
->assertOk() ->assertOk()
@ -124,6 +134,9 @@ class DeleteUserTest extends TestCase
->assertStatusMessageIs('success') ->assertStatusMessageIs('success')
->json(); ->json();
$userFromA->refresh();
$this->assertNotNull($userFromA->deleted_at);
} }
public function testUsersCannotDeleteThemselves() public function testUsersCannotDeleteThemselves()

View file

@ -65,18 +65,28 @@ class DeleteUserTest extends TestCase
->assertStatus(403); ->assertStatus(403);
$this->followRedirects($response)->assertSee('sad-panda.png'); $this->followRedirects($response)->assertSee('sad-panda.png');
$userFromB->refresh();
$this->assertNull($userFromB->deleted_at);
$response = $this->actingAs($userFromB) $response = $this->actingAs($userFromB)
->delete(route('users.destroy', ['user' => $userFromA->id])) ->delete(route('users.destroy', ['user' => $userFromA->id]))
->assertStatus(302) ->assertStatus(302)
->assertRedirect(route('users.index')); ->assertRedirect(route('users.index'));
$this->followRedirects($response)->assertSee('sad-panda.png'); $this->followRedirects($response)->assertSee('sad-panda.png');
$userFromA->refresh();
$this->assertNull($userFromA->deleted_at);
$response = $this->actingAs($superuser) $response = $this->actingAs($superuser)
->delete(route('users.destroy', ['user' => $userFromA->id])) ->delete(route('users.destroy', ['user' => $userFromA->id]))
->assertStatus(302) ->assertStatus(302)
->assertRedirect(route('users.index')); ->assertRedirect(route('users.index'));
$this->followRedirects($response)->assertSee('Success'); $this->followRedirects($response)->assertSee('Success');
$userFromA->refresh();
$this->assertNotNull($userFromA->deleted_at);
} }