diff --git a/tests/Feature/Users/Api/DeleteUserTest.php b/tests/Feature/Users/Api/DeleteUserTest.php index 7f7cb73f7d..f3f8e80f34 100644 --- a/tests/Feature/Users/Api/DeleteUserTest.php +++ b/tests/Feature/Users/Api/DeleteUserTest.php @@ -56,7 +56,7 @@ class DeleteUserTest extends TestCase ->json(); } - public function testDisallowUserDeletionIfNoDeletePermissions() + public function testPermissionsForDeletingUsers() { $this->actingAsForApi(User::factory()->create()) @@ -65,7 +65,7 @@ class DeleteUserTest extends TestCase ->json(); } - public function testDisallowUserDeletionIfNotInSameCompanyAndNotSuperadmin() + public function testPermissionsIfNotInSameCompanyAndNotSuperadmin() { $this->settings->enableMultipleFullCompanySupport(); [$companyA, $companyB] = Company::factory()->count(2)->create(); diff --git a/tests/Feature/Users/Api/ViewUserTest.php b/tests/Feature/Users/Api/ViewUserTest.php index 09d11a4ad3..6513f90d3e 100644 --- a/tests/Feature/Users/Api/ViewUserTest.php +++ b/tests/Feature/Users/Api/ViewUserTest.php @@ -20,7 +20,7 @@ class ViewUserTest extends TestCase ->assertOk(); } - public function testUserWithoutCompanyPermissionsCannotDeleteUser() + public function testPermissionsWithCompanyableToDeleteUser() { $this->settings->enableMultipleFullCompanySupport(); diff --git a/tests/Feature/Users/DeleteUserTest.php b/tests/Feature/Users/DeleteUserTest.php index 818f554c47..b24fb0e9bf 100644 --- a/tests/Feature/Users/DeleteUserTest.php +++ b/tests/Feature/Users/DeleteUserTest.php @@ -11,59 +11,7 @@ use App\Notifications\CurrentInventory; class DeleteUserTest extends TestCase { - public function testUserWithoutCompanyPermissionsCannotViewPrintAllInventoryPage() - { - $this->settings->enableMultipleFullCompanySupport(); - //$this->withoutExceptionHandling(); - - [$companyA, $companyB] = Company::factory()->count(2)->create(); - - $superuser = User::factory()->superuser()->create(); - $user = User::factory()->for($companyB)->create(); - - $this->actingAs(User::factory()->viewUsers()->for($companyA)->create()) - ->get(route('users.print', ['userId' => $user->id])) - ->assertStatus(403); - - $this->actingAs(User::factory()->viewUsers()->for($companyB)->create()) - ->get(route('users.print', ['userId' => $user->id])) - ->assertStatus(200); - - $this->actingAs($superuser) - ->get(route('users.print', ['userId' => $user->id])) - ->assertOk() - ->assertStatus(200); - } - - public function testUserWithoutCompanyPermissionsCannotSendInventory() - { - Notification::fake(); - - $this->settings->enableMultipleFullCompanySupport(); - - [$companyA, $companyB] = Company::factory()->count(2)->create(); - - $superuser = User::factory()->superuser()->create(); - $user = User::factory()->for($companyB)->create(); - - $this->actingAs(User::factory()->viewUsers()->for($companyA)->create()) - ->post(route('users.email', ['userId' => $user->id])) - ->assertStatus(403); - - $this->actingAs(User::factory()->viewUsers()->for($companyB)->create()) - ->post(route('users.email', ['userId' => $user->id])) - ->assertStatus(302); - - $this->actingAs($superuser) - ->post(route('users.email', ['userId' => $user->id])) - ->assertStatus(302); - - Notification::assertSentTo( - [$user], CurrentInventory::class - ); - } - - public function testUserWithoutCompanyPermissionsCannotDeleteUser() + public function testPermissionsToDeleteUser() { $this->settings->enableMultipleFullCompanySupport(); diff --git a/tests/Feature/Users/ViewUserTest.php b/tests/Feature/Users/ViewUserTest.php index a1d2fc3b9b..a9dc083540 100644 --- a/tests/Feature/Users/ViewUserTest.php +++ b/tests/Feature/Users/ViewUserTest.php @@ -10,7 +10,7 @@ use App\Notifications\CurrentInventory; class ViewUserTest extends TestCase { - public function testUserWithoutCompanyPermissionsCannotViewUserDetailPage() + public function testPermissionsForUserDetailPage() { $this->settings->enableMultipleFullCompanySupport(); @@ -29,7 +29,7 @@ class ViewUserTest extends TestCase ->assertStatus(200); } - public function testUserWithoutCompanyPermissionsCannotViewPrintAllInventoryPage() + public function testPermissionsForPrintAllInventoryPage() { $this->settings->enableMultipleFullCompanySupport(); //$this->withoutExceptionHandling();