mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
134183ef16
commit
ea990a5381
|
@ -15,7 +15,7 @@ class ViewUserTest extends TestCase
|
||||||
{
|
{
|
||||||
$user = User::factory()->create();
|
$user = User::factory()->create();
|
||||||
|
|
||||||
$this->actingAs(User::factory()->viewUsers()->create())
|
$this->actingAsForApi(User::factory()->viewUsers()->create())
|
||||||
->getJson(route('api.users.show', $user))
|
->getJson(route('api.users.show', $user))
|
||||||
->assertOk();
|
->assertOk();
|
||||||
}
|
}
|
||||||
|
@ -31,22 +31,30 @@ class ViewUserTest extends TestCase
|
||||||
$userFromA = User::factory()->for($companyA)->create();
|
$userFromA = User::factory()->for($companyA)->create();
|
||||||
$userFromB = User::factory()->for($companyB)->create();
|
$userFromB = User::factory()->for($companyB)->create();
|
||||||
|
|
||||||
$this->followingRedirects()->actingAsForApi(User::factory()->deleteUsers()->for($companyA)->create())
|
$this->actingAsForApi(User::factory()->deleteUsers()->for($companyA)->create())
|
||||||
->delete(route('users.destroy', ['user' => $userFromB->id]))
|
->deleteJson(route('api.users.destroy', $userFromA->id))
|
||||||
|
->assertOk()
|
||||||
|
->assertStatus(200)
|
||||||
|
->assertStatusMessageIs('success')
|
||||||
|
->json();
|
||||||
|
|
||||||
|
$this->actingAsForApi(User::factory()->deleteUsers()->for($companyB)->create())
|
||||||
|
->deleteJson(route('api.users.destroy', $userFromA->id))
|
||||||
->assertStatus(403);
|
->assertStatus(403);
|
||||||
|
|
||||||
$this->actingAs(User::factory()->deleteUsers()->for($companyA)->create())
|
$this->actingAsForApi($superuser)
|
||||||
->delete(route('users.destroy', ['user' => $userFromA->id]))
|
->deleteJson(route('api.users.destroy', $userFromA->id))
|
||||||
->assertStatus(302)
|
->assertOk()
|
||||||
->assertRedirect(route('users.index'));
|
->assertStatus(200)
|
||||||
|
->assertStatusMessageIs('success')
|
||||||
|
->json();
|
||||||
|
|
||||||
$this->actingAs($superuser)
|
$this->actingAsForApi($superuser)
|
||||||
->post(route('users.destroy', ['userId' => $userFromA->id]))
|
->deleteJson(route('api.users.destroy', $userFromB->id))
|
||||||
->assertStatus(302);
|
->assertOk()
|
||||||
|
->assertStatus(200)
|
||||||
$this->actingAs($superuser)
|
->assertStatusMessageIs('success')
|
||||||
->post(route('users.destroy', ['userId' => $userFromB->id]))
|
->json();
|
||||||
->assertStatus(302);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@ use App\Models\LicenseSeat;
|
||||||
use App\Models\Location;
|
use App\Models\Location;
|
||||||
use App\Models\Accessory;
|
use App\Models\Accessory;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Models\Company;
|
||||||
|
|
||||||
use App\Models\Asset;
|
use App\Models\Asset;
|
||||||
|
|
||||||
|
@ -43,7 +44,7 @@ class DeleteUserTest extends TestCase
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function testDisallowUserDeletionIfStillManagingPeople()
|
public function testDisallowUserDeletionIfStillManagingPeople()
|
||||||
{
|
{
|
||||||
$manager = User::factory()->create();
|
$manager = User::factory()->create();
|
||||||
|
|
|
@ -32,7 +32,6 @@ class ViewUserTest extends TestCase
|
||||||
public function testPermissionsForPrintAllInventoryPage()
|
public function testPermissionsForPrintAllInventoryPage()
|
||||||
{
|
{
|
||||||
$this->settings->enableMultipleFullCompanySupport();
|
$this->settings->enableMultipleFullCompanySupport();
|
||||||
//$this->withoutExceptionHandling();
|
|
||||||
|
|
||||||
[$companyA, $companyB] = Company::factory()->count(2)->create();
|
[$companyA, $companyB] = Company::factory()->count(2)->create();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue