From 29a36839aafc2270651282c661a30796e4fc117f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 3 Jun 2024 16:29:53 -0700
Subject: [PATCH 1/7] Move existing API checkin and checkout tests under domain
 directory

---
 tests/Feature/Api/{Assets => Checkins}/AssetCheckinTest.php     | 2 +-
 .../Api/{Accessories => Checkouts}/AccessoryCheckoutTest.php    | 2 +-
 tests/Feature/Api/{Assets => Checkouts}/AssetCheckoutTest.php   | 2 +-
 .../Api/{Consumables => Checkouts}/ConsumableCheckoutTest.php   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/Feature/Api/{Assets => Checkins}/AssetCheckinTest.php (99%)
 rename tests/Feature/Api/{Accessories => Checkouts}/AccessoryCheckoutTest.php (98%)
 rename tests/Feature/Api/{Assets => Checkouts}/AssetCheckoutTest.php (99%)
 rename tests/Feature/Api/{Consumables => Checkouts}/ConsumableCheckoutTest.php (98%)

diff --git a/tests/Feature/Api/Assets/AssetCheckinTest.php b/tests/Feature/Api/Checkins/AssetCheckinTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetCheckinTest.php
rename to tests/Feature/Api/Checkins/AssetCheckinTest.php
index add90a067..edd3f8019 100644
--- a/tests/Feature/Api/Assets/AssetCheckinTest.php
+++ b/tests/Feature/Api/Checkins/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Api\Checkins;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;
diff --git a/tests/Feature/Api/Accessories/AccessoryCheckoutTest.php b/tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
rename to tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php
index 854a96ada..bbc187c12 100644
--- a/tests/Feature/Api/Accessories/AccessoryCheckoutTest.php
+++ b/tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Accessories;
+namespace Tests\Feature\Api\Checkouts;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
diff --git a/tests/Feature/Api/Assets/AssetCheckoutTest.php b/tests/Feature/Api/Checkouts/AssetCheckoutTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetCheckoutTest.php
rename to tests/Feature/Api/Checkouts/AssetCheckoutTest.php
index 82d572ef5..63c80e5eb 100644
--- a/tests/Feature/Api/Assets/AssetCheckoutTest.php
+++ b/tests/Feature/Api/Checkouts/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Api\Checkouts;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
diff --git a/tests/Feature/Api/Consumables/ConsumableCheckoutTest.php b/tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Consumables/ConsumableCheckoutTest.php
rename to tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php
index 1528e65aa..58c107228 100644
--- a/tests/Feature/Api/Consumables/ConsumableCheckoutTest.php
+++ b/tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Api\Checkouts;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;

From 86bd9a26747967fdaad3bea534bfb7700c63aba2 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 3 Jun 2024 16:49:44 -0700
Subject: [PATCH 2/7] Move test method to existing test

---
 tests/Feature/Api/Users/UpdateUserApiTest.php | 73 ++++++++++++++++
 tests/Feature/Api/Users/UsersUpdateTest.php   | 84 -------------------
 2 files changed, 73 insertions(+), 84 deletions(-)
 delete mode 100644 tests/Feature/Api/Users/UsersUpdateTest.php

diff --git a/tests/Feature/Api/Users/UpdateUserApiTest.php b/tests/Feature/Api/Users/UpdateUserApiTest.php
index 37ebce4a4..2635dc867 100644
--- a/tests/Feature/Api/Users/UpdateUserApiTest.php
+++ b/tests/Feature/Api/Users/UpdateUserApiTest.php
@@ -3,12 +3,85 @@
 namespace Tests\Feature\Api\Users;
 
 use App\Models\Company;
+use App\Models\Department;
 use App\Models\Group;
+use App\Models\Location;
 use App\Models\User;
+use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
 
 class UpdateUserApiTest extends TestCase
 {
+    public function testCanUpdateUserViaPatch()
+    {
+        $admin = User::factory()->superuser()->create();
+        $manager = User::factory()->create();
+        $company = Company::factory()->create();
+        $department = Department::factory()->create();
+        $location = Location::factory()->create();
+        [$groupA, $groupB] = Group::factory()->count(2)->create();
+
+        $user = User::factory()->create([
+            'activated' => false,
+            'remote' => false,
+            'vip' => false,
+        ]);
+
+        $this->actingAsForApi($admin)
+            ->patchJson(route('api.users.update', $user), [
+                'first_name' => 'Mabel',
+                'last_name' => 'Mora',
+                'username' => 'mabel',
+                'password' => 'super-secret',
+                'email' => 'mabel@onlymurderspod.com',
+                'permissions' => '{"a.new.permission":"1"}',
+                'activated' => true,
+                'phone' => '619-555-5555',
+                'jobtitle' => 'Host',
+                'manager_id' => $manager->id,
+                'employee_num' => '1111',
+                'notes' => 'Pretty good artist',
+                'company_id' => $company->id,
+                'department_id' => $department->id,
+                'location_id' => $location->id,
+                'remote' => true,
+                'groups' => $groupA->id,
+                'vip' => true,
+                'start_date' => '2021-08-01',
+                'end_date' => '2025-12-31',
+            ])
+            ->assertOk();
+
+        $user->refresh();
+        $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
+        $this->assertEquals('Mora', $user->last_name, 'Last name was not updated');
+        $this->assertEquals('mabel', $user->username, 'Username was not updated');
+        $this->assertTrue(Hash::check('super-secret', $user->password), 'Password was not updated');
+        $this->assertEquals('mabel@onlymurderspod.com', $user->email, 'Email was not updated');
+        $this->assertArrayHasKey('a.new.permission', $user->decodePermissions(), 'Permissions were not updated');
+        $this->assertTrue((bool) $user->activated, 'User not marked as activated');
+        $this->assertEquals('619-555-5555', $user->phone, 'Phone was not updated');
+        $this->assertEquals('Host', $user->jobtitle, 'Job title was not updated');
+        $this->assertTrue($user->manager->is($manager), 'Manager was not updated');
+        $this->assertEquals('1111', $user->employee_num, 'Employee number was not updated');
+        $this->assertEquals('Pretty good artist', $user->notes, 'Notes was not updated');
+        $this->assertTrue($user->company->is($company), 'Company was not updated');
+        $this->assertTrue($user->department->is($department), 'Department was not updated');
+        $this->assertTrue($user->location->is($location), 'Location was not updated');
+        $this->assertEquals(1, $user->remote, 'Remote was not updated');
+        $this->assertTrue($user->groups->contains($groupA), 'Groups were not updated');
+        $this->assertEquals(1, $user->vip, 'VIP was not updated');
+        $this->assertEquals('2021-08-01', $user->start_date, 'Start date was not updated');
+        $this->assertEquals('2025-12-31', $user->end_date, 'End date was not updated');
+
+        // `groups` can be an id or array or ids
+        $this->patch(route('api.users.update', $user), ['groups' => [$groupA->id, $groupB->id]]);
+
+        $user->refresh();
+        $this->assertTrue($user->groups->contains($groupA), 'Not part of expected group');
+        $this->assertTrue($user->groups->contains($groupB), 'Not part of expected group');
+    }
+
     public function testApiUsersCanBeActivatedWithNumber()
     {
         $admin = User::factory()->superuser()->create();
diff --git a/tests/Feature/Api/Users/UsersUpdateTest.php b/tests/Feature/Api/Users/UsersUpdateTest.php
deleted file mode 100644
index d6e0f9e46..000000000
--- a/tests/Feature/Api/Users/UsersUpdateTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-namespace Tests\Feature\Api\Users;
-
-use App\Models\Company;
-use App\Models\Department;
-use App\Models\Group;
-use App\Models\Location;
-use App\Models\User;
-use Illuminate\Support\Facades\Hash;
-use Tests\TestCase;
-
-class UsersUpdateTest extends TestCase
-{
-    public function testCanUpdateUserViaPatch()
-    {
-        $admin = User::factory()->superuser()->create();
-        $manager = User::factory()->create();
-        $company = Company::factory()->create();
-        $department = Department::factory()->create();
-        $location = Location::factory()->create();
-        [$groupA, $groupB] = Group::factory()->count(2)->create();
-
-        $user = User::factory()->create([
-            'activated' => false,
-            'remote' => false,
-            'vip' => false,
-        ]);
-
-        $this->actingAsForApi($admin)
-            ->patchJson(route('api.users.update', $user), [
-                'first_name' => 'Mabel',
-                'last_name' => 'Mora',
-                'username' => 'mabel',
-                'password' => 'super-secret',
-                'email' => 'mabel@onlymurderspod.com',
-                'permissions' => '{"a.new.permission":"1"}',
-                'activated' => true,
-                'phone' => '619-555-5555',
-                'jobtitle' => 'Host',
-                'manager_id' => $manager->id,
-                'employee_num' => '1111',
-                'notes' => 'Pretty good artist',
-                'company_id' => $company->id,
-                'department_id' => $department->id,
-                'location_id' => $location->id,
-                'remote' => true,
-                'groups' => $groupA->id,
-                'vip' => true,
-                'start_date' => '2021-08-01',
-                'end_date' => '2025-12-31',
-            ])
-            ->assertOk();
-
-        $user->refresh();
-        $this->assertEquals('Mabel', $user->first_name, 'First name was not updated');
-        $this->assertEquals('Mora', $user->last_name, 'Last name was not updated');
-        $this->assertEquals('mabel', $user->username, 'Username was not updated');
-        $this->assertTrue(Hash::check('super-secret', $user->password), 'Password was not updated');
-        $this->assertEquals('mabel@onlymurderspod.com', $user->email, 'Email was not updated');
-        $this->assertArrayHasKey('a.new.permission', $user->decodePermissions(), 'Permissions were not updated');
-        $this->assertTrue((bool)$user->activated, 'User not marked as activated');
-        $this->assertEquals('619-555-5555', $user->phone, 'Phone was not updated');
-        $this->assertEquals('Host', $user->jobtitle, 'Job title was not updated');
-        $this->assertTrue($user->manager->is($manager), 'Manager was not updated');
-        $this->assertEquals('1111', $user->employee_num, 'Employee number was not updated');
-        $this->assertEquals('Pretty good artist', $user->notes, 'Notes was not updated');
-        $this->assertTrue($user->company->is($company), 'Company was not updated');
-        $this->assertTrue($user->department->is($department), 'Department was not updated');
-        $this->assertTrue($user->location->is($location), 'Location was not updated');
-        $this->assertEquals(1, $user->remote, 'Remote was not updated');
-        $this->assertTrue($user->groups->contains($groupA), 'Groups were not updated');
-        $this->assertEquals(1, $user->vip, 'VIP was not updated');
-        $this->assertEquals('2021-08-01', $user->start_date, 'Start date was not updated');
-        $this->assertEquals('2025-12-31', $user->end_date, 'End date was not updated');
-
-        // `groups` can be an id or array or ids
-        $this->patch(route('api.users.update', $user), ['groups' => [$groupA->id, $groupB->id]]);
-
-        $user->refresh();
-        $this->assertTrue($user->groups->contains($groupA), 'Not part of expected group');
-        $this->assertTrue($user->groups->contains($groupB), 'Not part of expected group');
-    }
-}

From b07e3b4a9102a5bfbde7ba9322453b5a211891c2 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 3 Jun 2024 16:50:56 -0700
Subject: [PATCH 3/7] Remove API from test class name

---
 .../Api/Users/{UpdateUserApiTest.php => UpdateUserTest.php}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/Feature/Api/Users/{UpdateUserApiTest.php => UpdateUserTest.php} (99%)

diff --git a/tests/Feature/Api/Users/UpdateUserApiTest.php b/tests/Feature/Api/Users/UpdateUserTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UpdateUserApiTest.php
rename to tests/Feature/Api/Users/UpdateUserTest.php
index 2635dc867..37b137b41 100644
--- a/tests/Feature/Api/Users/UpdateUserApiTest.php
+++ b/tests/Feature/Api/Users/UpdateUserTest.php
@@ -10,7 +10,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Hash;
 use Tests\TestCase;
 
-class UpdateUserApiTest extends TestCase
+class UpdateUserTest extends TestCase
 {
     public function testCanUpdateUserViaPatch()
     {

From 95f6381da436dd0f0363ea0534315449c41da960 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 3 Jun 2024 16:53:15 -0700
Subject: [PATCH 4/7] Update tests names to VerbNounTest

---
 .../Api/Assets/{AssetStoreTest.php => StoreAssetTest.php}       | 2 +-
 .../Api/Assets/{AssetUpdateTest.php => UpdateAssetTest.php}     | 2 +-
 .../Api/Groups/{GroupStoreTest.php => StoreGroupTest.php}       | 2 +-
 .../Assets/{AssetsBulkEditTest.php => BulkEditAssetsTest.php}   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/Feature/Api/Assets/{AssetStoreTest.php => StoreAssetTest.php} (99%)
 rename tests/Feature/Api/Assets/{AssetUpdateTest.php => UpdateAssetTest.php} (98%)
 rename tests/Feature/Api/Groups/{GroupStoreTest.php => StoreGroupTest.php} (98%)
 rename tests/Feature/Assets/{AssetsBulkEditTest.php => BulkEditAssetsTest.php} (99%)

diff --git a/tests/Feature/Api/Assets/AssetStoreTest.php b/tests/Feature/Api/Assets/StoreAssetTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetStoreTest.php
rename to tests/Feature/Api/Assets/StoreAssetTest.php
index 006a5738f..617c7625b 100644
--- a/tests/Feature/Api/Assets/AssetStoreTest.php
+++ b/tests/Feature/Api/Assets/StoreAssetTest.php
@@ -16,7 +16,7 @@ use Illuminate\Testing\Fluent\AssertableJson;
 use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
-class AssetStoreTest extends TestCase
+class StoreAssetTest extends TestCase
 {
     public function testRequiresPermissionToCreateAsset()
     {
diff --git a/tests/Feature/Api/Assets/AssetUpdateTest.php b/tests/Feature/Api/Assets/UpdateAssetTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/AssetUpdateTest.php
rename to tests/Feature/Api/Assets/UpdateAssetTest.php
index ed830c379..1889a70a7 100644
--- a/tests/Feature/Api/Assets/AssetUpdateTest.php
+++ b/tests/Feature/Api/Assets/UpdateAssetTest.php
@@ -8,7 +8,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
-class AssetUpdateTest extends TestCase
+class UpdateAssetTest extends TestCase
 {
     public function testEncryptedCustomFieldCanBeUpdated()
     {
diff --git a/tests/Feature/Api/Groups/GroupStoreTest.php b/tests/Feature/Api/Groups/StoreGroupTest.php
similarity index 98%
rename from tests/Feature/Api/Groups/GroupStoreTest.php
rename to tests/Feature/Api/Groups/StoreGroupTest.php
index afa7a747d..e0c5118b6 100644
--- a/tests/Feature/Api/Groups/GroupStoreTest.php
+++ b/tests/Feature/Api/Groups/StoreGroupTest.php
@@ -7,7 +7,7 @@ use App\Models\Group;
 use App\Models\User;
 use Tests\TestCase;
 
-class GroupStoreTest extends TestCase
+class StoreGroupTest extends TestCase
 {
     public function testStoringGroupRequiresSuperAdminPermission()
     {
diff --git a/tests/Feature/Assets/AssetsBulkEditTest.php b/tests/Feature/Assets/BulkEditAssetsTest.php
similarity index 99%
rename from tests/Feature/Assets/AssetsBulkEditTest.php
rename to tests/Feature/Assets/BulkEditAssetsTest.php
index 70918b359..94458aafb 100644
--- a/tests/Feature/Assets/AssetsBulkEditTest.php
+++ b/tests/Feature/Assets/BulkEditAssetsTest.php
@@ -12,7 +12,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
-class AssetsBulkEditTest extends TestCase
+class BulkEditAssetsTest extends TestCase
 {
     public function testUserWithPermissionsCanAccessPage()
     {

From b1e8e5389bcc515e983b20f4a9c56a5fa0f1fb32 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 3 Jun 2024 16:54:59 -0700
Subject: [PATCH 5/7] Make most test names singular

---
 .../{RequestableAssetsTest.php => RequestableAssetTest.php}     | 2 +-
 .../{ConsumablesIndexTest.php => ConsumableIndexTest.php}       | 2 +-
 .../Licenses/{LicensesIndexTest.php => LicenseIndexTest.php}    | 2 +-
 .../Api/Users/{DeleteUsersTest.php => DeleteUserTest.php}       | 2 +-
 .../Api/Users/{UsersSearchTest.php => UserSearchTest.php}       | 2 +-
 tests/Feature/Users/{DeleteUsersTest.php => DeleteUserTest.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/Feature/Api/Assets/{RequestableAssetsTest.php => RequestableAssetTest.php} (98%)
 rename tests/Feature/Api/Consumables/{ConsumablesIndexTest.php => ConsumableIndexTest.php} (97%)
 rename tests/Feature/Api/Licenses/{LicensesIndexTest.php => LicenseIndexTest.php} (98%)
 rename tests/Feature/Api/Users/{DeleteUsersTest.php => DeleteUserTest.php} (98%)
 rename tests/Feature/Api/Users/{UsersSearchTest.php => UserSearchTest.php} (99%)
 rename tests/Feature/Users/{DeleteUsersTest.php => DeleteUserTest.php} (98%)

diff --git a/tests/Feature/Api/Assets/RequestableAssetsTest.php b/tests/Feature/Api/Assets/RequestableAssetTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/RequestableAssetsTest.php
rename to tests/Feature/Api/Assets/RequestableAssetTest.php
index d90e45f22..a4f3d805a 100644
--- a/tests/Feature/Api/Assets/RequestableAssetsTest.php
+++ b/tests/Feature/Api/Assets/RequestableAssetTest.php
@@ -7,7 +7,7 @@ use App\Models\Company;
 use App\Models\User;
 use Tests\TestCase;
 
-class RequestableAssetsTest extends TestCase
+class RequestableAssetTest extends TestCase
 {
     public function testViewingRequestableAssetsRequiresCorrectPermission()
     {
diff --git a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php b/tests/Feature/Api/Consumables/ConsumableIndexTest.php
similarity index 97%
rename from tests/Feature/Api/Consumables/ConsumablesIndexTest.php
rename to tests/Feature/Api/Consumables/ConsumableIndexTest.php
index 00fa43da2..8fc4b934a 100644
--- a/tests/Feature/Api/Consumables/ConsumablesIndexTest.php
+++ b/tests/Feature/Api/Consumables/ConsumableIndexTest.php
@@ -7,7 +7,7 @@ use App\Models\Consumable;
 use App\Models\User;
 use Tests\TestCase;
 
-class ConsumablesIndexTest extends TestCase
+class ConsumableIndexTest extends TestCase
 {
     public function testConsumableIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Licenses/LicensesIndexTest.php b/tests/Feature/Api/Licenses/LicenseIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Licenses/LicensesIndexTest.php
rename to tests/Feature/Api/Licenses/LicenseIndexTest.php
index 603002a09..c8b081aa4 100644
--- a/tests/Feature/Api/Licenses/LicensesIndexTest.php
+++ b/tests/Feature/Api/Licenses/LicenseIndexTest.php
@@ -7,7 +7,7 @@ use App\Models\License;
 use App\Models\User;
 use Tests\TestCase;
 
-class LicensesIndexTest extends TestCase
+class LicenseIndexTest extends TestCase
 {
     public function testLicensesIndexAdheresToCompanyScoping()
     {
diff --git a/tests/Feature/Api/Users/DeleteUsersTest.php b/tests/Feature/Api/Users/DeleteUserTest.php
similarity index 98%
rename from tests/Feature/Api/Users/DeleteUsersTest.php
rename to tests/Feature/Api/Users/DeleteUserTest.php
index e926311dc..c5ff0a4ac 100644
--- a/tests/Feature/Api/Users/DeleteUsersTest.php
+++ b/tests/Feature/Api/Users/DeleteUserTest.php
@@ -9,7 +9,7 @@ use App\Models\User;
 use App\Models\LicenseSeat;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {
 
 
diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Api/Users/UserSearchTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UsersSearchTest.php
rename to tests/Feature/Api/Users/UserSearchTest.php
index 72f23017f..fe5849d32 100644
--- a/tests/Feature/Api/Users/UsersSearchTest.php
+++ b/tests/Feature/Api/Users/UserSearchTest.php
@@ -7,7 +7,7 @@ use App\Models\User;
 use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class UsersSearchTest extends TestCase
+class UserSearchTest extends TestCase
 {
     public function testCanSearchByUserFirstAndLastName()
     {
diff --git a/tests/Feature/Users/DeleteUsersTest.php b/tests/Feature/Users/DeleteUserTest.php
similarity index 98%
rename from tests/Feature/Users/DeleteUsersTest.php
rename to tests/Feature/Users/DeleteUserTest.php
index a9ac1ab1f..69ac9672a 100644
--- a/tests/Feature/Users/DeleteUsersTest.php
+++ b/tests/Feature/Users/DeleteUserTest.php
@@ -7,7 +7,7 @@ use App\Models\User;
 use Laravel\Passport\Passport;
 use Tests\TestCase;
 
-class DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {
 
 

From d202dfc22593f21f6457f05d194c58d2c49d6a7f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Jun 2024 10:48:53 -0700
Subject: [PATCH 6/7] Organize API tests into domains

---
 tests/Feature/{Api/Assets => Assets/Api}/AssetIndexTest.php  | 5 +++--
 .../{Api/Assets => Assets/Api}/AssetsForSelectListTest.php   | 2 +-
 .../{Api/Assets => Assets/Api}/RequestableAssetTest.php      | 2 +-
 tests/Feature/{Api/Assets => Assets/Api}/StoreAssetTest.php  | 4 +---
 tests/Feature/{Api/Assets => Assets/Api}/UpdateAssetTest.php | 2 +-
 tests/Feature/Assets/{ => Ui}/BulkEditAssetsTest.php         | 2 +-
 .../{Api/Checkins => Checkins/Api}/AssetCheckinTest.php      | 2 +-
 tests/Feature/Checkins/{ => Ui}/AccessoryCheckinTest.php     | 2 +-
 tests/Feature/Checkins/{ => Ui}/AssetCheckinTest.php         | 2 +-
 .../CheckoutAcceptances/{ => Ui}/AccessoryAcceptanceTest.php | 2 +-
 .../Checkouts => Checkouts/Api}/AccessoryCheckoutTest.php    | 2 +-
 .../{Api/Checkouts => Checkouts/Api}/AssetCheckoutTest.php   | 2 +-
 .../Checkouts => Checkouts/Api}/ConsumableCheckoutTest.php   | 2 +-
 tests/Feature/Checkouts/{ => Ui}/AccessoryCheckoutTest.php   | 2 +-
 tests/Feature/Checkouts/{ => Ui}/AssetCheckoutTest.php       | 2 +-
 tests/Feature/Checkouts/{ => Ui}/ConsumableCheckoutTest.php  | 2 +-
 tests/Feature/Checkouts/{ => Ui}/LicenseCheckoutTest.php     | 2 +-
 .../Components => Components/Api}/ComponentIndexTest.php     | 2 +-
 .../Consumables => Consumables/Api}/ConsumableIndexTest.php  | 2 +-
 .../Departments => Departments/Api}/DepartmentIndexTest.php  | 2 +-
 tests/Feature/{Api/Groups => Groups/Api}/StoreGroupTest.php  | 2 +-
 .../{Api/Licenses => Licenses/Api}/LicenseIndexTest.php      | 2 +-
 .../Api}/LocationsForSelectListTest.php                      | 2 +-
 tests/Feature/{Api/Users => Users/Api}/DeleteUserTest.php    | 5 ++---
 tests/Feature/{Api/Users => Users/Api}/UpdateUserTest.php    | 2 +-
 tests/Feature/{Api/Users => Users/Api}/UserSearchTest.php    | 2 +-
 .../{Api/Users => Users/Api}/UsersForSelectListTest.php      | 2 +-
 tests/Feature/Users/{ => Ui}/DeleteUserTest.php              | 3 +--
 tests/Feature/Users/{ => Ui}/UpdateUserTest.php              | 2 +-
 29 files changed, 32 insertions(+), 35 deletions(-)
 rename tests/Feature/{Api/Assets => Assets/Api}/AssetIndexTest.php (99%)
 rename tests/Feature/{Api/Assets => Assets/Api}/AssetsForSelectListTest.php (98%)
 rename tests/Feature/{Api/Assets => Assets/Api}/RequestableAssetTest.php (98%)
 rename tests/Feature/{Api/Assets => Assets/Api}/StoreAssetTest.php (99%)
 rename tests/Feature/{Api/Assets => Assets/Api}/UpdateAssetTest.php (98%)
 rename tests/Feature/Assets/{ => Ui}/BulkEditAssetsTest.php (99%)
 rename tests/Feature/{Api/Checkins => Checkins/Api}/AssetCheckinTest.php (99%)
 rename tests/Feature/Checkins/{ => Ui}/AccessoryCheckinTest.php (98%)
 rename tests/Feature/Checkins/{ => Ui}/AssetCheckinTest.php (99%)
 rename tests/Feature/CheckoutAcceptances/{ => Ui}/AccessoryAcceptanceTest.php (98%)
 rename tests/Feature/{Api/Checkouts => Checkouts/Api}/AccessoryCheckoutTest.php (98%)
 rename tests/Feature/{Api/Checkouts => Checkouts/Api}/AssetCheckoutTest.php (99%)
 rename tests/Feature/{Api/Checkouts => Checkouts/Api}/ConsumableCheckoutTest.php (98%)
 rename tests/Feature/Checkouts/{ => Ui}/AccessoryCheckoutTest.php (98%)
 rename tests/Feature/Checkouts/{ => Ui}/AssetCheckoutTest.php (99%)
 rename tests/Feature/Checkouts/{ => Ui}/ConsumableCheckoutTest.php (98%)
 rename tests/Feature/Checkouts/{ => Ui}/LicenseCheckoutTest.php (97%)
 rename tests/Feature/{Api/Components => Components/Api}/ComponentIndexTest.php (98%)
 rename tests/Feature/{Api/Consumables => Consumables/Api}/ConsumableIndexTest.php (98%)
 rename tests/Feature/{Api/Departments => Departments/Api}/DepartmentIndexTest.php (98%)
 rename tests/Feature/{Api/Groups => Groups/Api}/StoreGroupTest.php (98%)
 rename tests/Feature/{Api/Licenses => Licenses/Api}/LicenseIndexTest.php (98%)
 rename tests/Feature/{Api/Locations => Locations/Api}/LocationsForSelectListTest.php (97%)
 rename tests/Feature/{Api/Users => Users/Api}/DeleteUserTest.php (98%)
 rename tests/Feature/{Api/Users => Users/Api}/UpdateUserTest.php (99%)
 rename tests/Feature/{Api/Users => Users/Api}/UserSearchTest.php (99%)
 rename tests/Feature/{Api/Users => Users/Api}/UsersForSelectListTest.php (99%)
 rename tests/Feature/Users/{ => Ui}/DeleteUserTest.php (97%)
 rename tests/Feature/Users/{ => Ui}/UpdateUserTest.php (98%)

diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php b/tests/Feature/Assets/Api/AssetIndexTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/AssetIndexTest.php
rename to tests/Feature/Assets/Api/AssetIndexTest.php
index 0a21e13f2..c4a362d28 100644
--- a/tests/Feature/Api/Assets/AssetIndexTest.php
+++ b/tests/Feature/Assets/Api/AssetIndexTest.php
@@ -1,13 +1,14 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
+use Carbon\Carbon;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Tests\TestCase;
-use Carbon\Carbon;
+
 class AssetIndexTest extends TestCase
 {
     public function testAssetApiIndexReturnsExpectedAssets()
diff --git a/tests/Feature/Api/Assets/AssetsForSelectListTest.php b/tests/Feature/Assets/Api/AssetsForSelectListTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/AssetsForSelectListTest.php
rename to tests/Feature/Assets/Api/AssetsForSelectListTest.php
index 3c5e1e4e7..de797651e 100644
--- a/tests/Feature/Api/Assets/AssetsForSelectListTest.php
+++ b/tests/Feature/Assets/Api/AssetsForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
diff --git a/tests/Feature/Api/Assets/RequestableAssetTest.php b/tests/Feature/Assets/Api/RequestableAssetTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/RequestableAssetTest.php
rename to tests/Feature/Assets/Api/RequestableAssetTest.php
index a4f3d805a..d24913ad6 100644
--- a/tests/Feature/Api/Assets/RequestableAssetTest.php
+++ b/tests/Feature/Assets/Api/RequestableAssetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\Company;
diff --git a/tests/Feature/Api/Assets/StoreAssetTest.php b/tests/Feature/Assets/Api/StoreAssetTest.php
similarity index 99%
rename from tests/Feature/Api/Assets/StoreAssetTest.php
rename to tests/Feature/Assets/Api/StoreAssetTest.php
index 617c7625b..2629f735b 100644
--- a/tests/Feature/Api/Assets/StoreAssetTest.php
+++ b/tests/Feature/Assets/Api/StoreAssetTest.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
-use App\Helpers\Helper;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Company;
@@ -13,7 +12,6 @@ use App\Models\Supplier;
 use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Illuminate\Testing\TestResponse;
 use Tests\TestCase;
 
 class StoreAssetTest extends TestCase
diff --git a/tests/Feature/Api/Assets/UpdateAssetTest.php b/tests/Feature/Assets/Api/UpdateAssetTest.php
similarity index 98%
rename from tests/Feature/Api/Assets/UpdateAssetTest.php
rename to tests/Feature/Assets/Api/UpdateAssetTest.php
index 1889a70a7..70ad3aa5b 100644
--- a/tests/Feature/Api/Assets/UpdateAssetTest.php
+++ b/tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\CustomField;
diff --git a/tests/Feature/Assets/BulkEditAssetsTest.php b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
similarity index 99%
rename from tests/Feature/Assets/BulkEditAssetsTest.php
rename to tests/Feature/Assets/Ui/BulkEditAssetsTest.php
index 94458aafb..02d39a7b4 100644
--- a/tests/Feature/Assets/BulkEditAssetsTest.php
+++ b/tests/Feature/Assets/Ui/BulkEditAssetsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Assets;
+namespace Tests\Feature\Assets\Ui;
 
 use App\Models\Asset;
 use App\Models\AssetModel;
diff --git a/tests/Feature/Api/Checkins/AssetCheckinTest.php b/tests/Feature/Checkins/Api/AssetCheckinTest.php
similarity index 99%
rename from tests/Feature/Api/Checkins/AssetCheckinTest.php
rename to tests/Feature/Checkins/Api/AssetCheckinTest.php
index edd3f8019..0e041fc73 100644
--- a/tests/Feature/Api/Checkins/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Api/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Checkins;
+namespace Tests\Feature\Checkins\Api;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;
diff --git a/tests/Feature/Checkins/AccessoryCheckinTest.php b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
similarity index 98%
rename from tests/Feature/Checkins/AccessoryCheckinTest.php
rename to tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
index 56030991e..1213741bc 100644
--- a/tests/Feature/Checkins/AccessoryCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AccessoryCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkins;
+namespace Tests\Feature\Checkins\Ui;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Accessory;
diff --git a/tests/Feature/Checkins/AssetCheckinTest.php b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
similarity index 99%
rename from tests/Feature/Checkins/AssetCheckinTest.php
rename to tests/Feature/Checkins/Ui/AssetCheckinTest.php
index 1ccbbfaa0..cebd5010f 100644
--- a/tests/Feature/Checkins/AssetCheckinTest.php
+++ b/tests/Feature/Checkins/Ui/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkins;
+namespace Tests\Feature\Checkins\Ui;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;
diff --git a/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
similarity index 98%
rename from tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
rename to tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
index bdaf0e780..83ec916cb 100644
--- a/tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php
+++ b/tests/Feature/CheckoutAcceptances/Ui/AccessoryAcceptanceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\CheckoutAcceptances;
+namespace Tests\Feature\CheckoutAcceptances\Ui;
 
 use App\Models\Accessory;
 use App\Models\CheckoutAcceptance;
diff --git a/tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php
rename to tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
index bbc187c12..e6128aa78 100644
--- a/tests/Feature/Api/Checkouts/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Checkouts;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
diff --git a/tests/Feature/Api/Checkouts/AssetCheckoutTest.php b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
similarity index 99%
rename from tests/Feature/Api/Checkouts/AssetCheckoutTest.php
rename to tests/Feature/Checkouts/Api/AssetCheckoutTest.php
index 63c80e5eb..f85af9035 100644
--- a/tests/Feature/Api/Checkouts/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Checkouts;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
diff --git a/tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
similarity index 98%
rename from tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php
rename to tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
index 58c107228..3bd0212fd 100644
--- a/tests/Feature/Api/Checkouts/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Api/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Checkouts;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;
diff --git a/tests/Feature/Checkouts/AccessoryCheckoutTest.php b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
similarity index 98%
rename from tests/Feature/Checkouts/AccessoryCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
index 11224e4d1..8f97a4831 100644
--- a/tests/Feature/Checkouts/AccessoryCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;
diff --git a/tests/Feature/Checkouts/AssetCheckoutTest.php b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
similarity index 99%
rename from tests/Feature/Checkouts/AssetCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
index 6dcff789f..eed0908c1 100644
--- a/tests/Feature/Checkouts/AssetCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;
diff --git a/tests/Feature/Checkouts/ConsumableCheckoutTest.php b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
similarity index 98%
rename from tests/Feature/Checkouts/ConsumableCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
index e38ae96c8..b59564049 100644
--- a/tests/Feature/Checkouts/ConsumableCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;
diff --git a/tests/Feature/Checkouts/LicenseCheckoutTest.php b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
similarity index 97%
rename from tests/Feature/Checkouts/LicenseCheckoutTest.php
rename to tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
index 2f4f51d4a..8e5cd8306 100644
--- a/tests/Feature/Checkouts/LicenseCheckoutTest.php
+++ b/tests/Feature/Checkouts/Ui/LicenseCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Checkouts;
+namespace Tests\Feature\Checkouts\Ui;
 
 use App\Models\Asset;
 use App\Models\License;
diff --git a/tests/Feature/Api/Components/ComponentIndexTest.php b/tests/Feature/Components/Api/ComponentIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Components/ComponentIndexTest.php
rename to tests/Feature/Components/Api/ComponentIndexTest.php
index 517724a49..4260372c0 100644
--- a/tests/Feature/Api/Components/ComponentIndexTest.php
+++ b/tests/Feature/Components/Api/ComponentIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Components;
+namespace Tests\Feature\Components\Api;
 
 use App\Models\Company;
 use App\Models\Component;
diff --git a/tests/Feature/Api/Consumables/ConsumableIndexTest.php b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Consumables/ConsumableIndexTest.php
rename to tests/Feature/Consumables/Api/ConsumableIndexTest.php
index 8fc4b934a..b16dfdfa5 100644
--- a/tests/Feature/Api/Consumables/ConsumableIndexTest.php
+++ b/tests/Feature/Consumables/Api/ConsumableIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Consumables\Api;
 
 use App\Models\Company;
 use App\Models\Consumable;
diff --git a/tests/Feature/Api/Departments/DepartmentIndexTest.php b/tests/Feature/Departments/Api/DepartmentIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Departments/DepartmentIndexTest.php
rename to tests/Feature/Departments/Api/DepartmentIndexTest.php
index 11ab5df9b..462c0dc8e 100644
--- a/tests/Feature/Api/Departments/DepartmentIndexTest.php
+++ b/tests/Feature/Departments/Api/DepartmentIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Departments;
+namespace Tests\Feature\Departments\Api;
 
 use App\Models\Company;
 use App\Models\Department;
diff --git a/tests/Feature/Api/Groups/StoreGroupTest.php b/tests/Feature/Groups/Api/StoreGroupTest.php
similarity index 98%
rename from tests/Feature/Api/Groups/StoreGroupTest.php
rename to tests/Feature/Groups/Api/StoreGroupTest.php
index e0c5118b6..ebcbff71c 100644
--- a/tests/Feature/Api/Groups/StoreGroupTest.php
+++ b/tests/Feature/Groups/Api/StoreGroupTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Groups;
+namespace Tests\Feature\Groups\Api;
 
 use App\Helpers\Helper;
 use App\Models\Group;
diff --git a/tests/Feature/Api/Licenses/LicenseIndexTest.php b/tests/Feature/Licenses/Api/LicenseIndexTest.php
similarity index 98%
rename from tests/Feature/Api/Licenses/LicenseIndexTest.php
rename to tests/Feature/Licenses/Api/LicenseIndexTest.php
index c8b081aa4..1df786427 100644
--- a/tests/Feature/Api/Licenses/LicenseIndexTest.php
+++ b/tests/Feature/Licenses/Api/LicenseIndexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Licenses;
+namespace Tests\Feature\Licenses\Api;
 
 use App\Models\Company;
 use App\Models\License;
diff --git a/tests/Feature/Api/Locations/LocationsForSelectListTest.php b/tests/Feature/Locations/Api/LocationsForSelectListTest.php
similarity index 97%
rename from tests/Feature/Api/Locations/LocationsForSelectListTest.php
rename to tests/Feature/Locations/Api/LocationsForSelectListTest.php
index bfc7fc537..f34b97892 100644
--- a/tests/Feature/Api/Locations/LocationsForSelectListTest.php
+++ b/tests/Feature/Locations/Api/LocationsForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Locations;
+namespace Tests\Feature\Locations\Api;
 
 use App\Models\Location;
 use App\Models\User;
diff --git a/tests/Feature/Api/Users/DeleteUserTest.php b/tests/Feature/Users/Api/DeleteUserTest.php
similarity index 98%
rename from tests/Feature/Api/Users/DeleteUserTest.php
rename to tests/Feature/Users/Api/DeleteUserTest.php
index c5ff0a4ac..7f7cb73f7 100644
--- a/tests/Feature/Api/Users/DeleteUserTest.php
+++ b/tests/Feature/Users/Api/DeleteUserTest.php
@@ -1,12 +1,11 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
-use App\Models\Asset;
 use App\Models\Company;
+use App\Models\LicenseSeat;
 use App\Models\Location;
 use App\Models\User;
-use App\Models\LicenseSeat;
 use Tests\TestCase;
 
 class DeleteUserTest extends TestCase
diff --git a/tests/Feature/Api/Users/UpdateUserTest.php b/tests/Feature/Users/Api/UpdateUserTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UpdateUserTest.php
rename to tests/Feature/Users/Api/UpdateUserTest.php
index 37b137b41..020bb9a07 100644
--- a/tests/Feature/Api/Users/UpdateUserTest.php
+++ b/tests/Feature/Users/Api/UpdateUserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
 use App\Models\Department;
diff --git a/tests/Feature/Api/Users/UserSearchTest.php b/tests/Feature/Users/Api/UserSearchTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UserSearchTest.php
rename to tests/Feature/Users/Api/UserSearchTest.php
index fe5849d32..2b1d55797 100644
--- a/tests/Feature/Api/Users/UserSearchTest.php
+++ b/tests/Feature/Users/Api/UserSearchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
 use App\Models\User;
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Users/Api/UsersForSelectListTest.php
similarity index 99%
rename from tests/Feature/Api/Users/UsersForSelectListTest.php
rename to tests/Feature/Users/Api/UsersForSelectListTest.php
index 1ebfcf72e..1367f408d 100644
--- a/tests/Feature/Api/Users/UsersForSelectListTest.php
+++ b/tests/Feature/Users/Api/UsersForSelectListTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Users;
+namespace Tests\Feature\Users\Api;
 
 use App\Models\Company;
 use App\Models\User;
diff --git a/tests/Feature/Users/DeleteUserTest.php b/tests/Feature/Users/Ui/DeleteUserTest.php
similarity index 97%
rename from tests/Feature/Users/DeleteUserTest.php
rename to tests/Feature/Users/Ui/DeleteUserTest.php
index 69ac9672a..a3bb7364b 100644
--- a/tests/Feature/Users/DeleteUserTest.php
+++ b/tests/Feature/Users/Ui/DeleteUserTest.php
@@ -1,10 +1,9 @@
 <?php
 
-namespace Tests\Feature\Users;
+namespace Tests\Feature\Users\Ui;
 
 use App\Models\Location;
 use App\Models\User;
-use Laravel\Passport\Passport;
 use Tests\TestCase;
 
 class DeleteUserTest extends TestCase
diff --git a/tests/Feature/Users/UpdateUserTest.php b/tests/Feature/Users/Ui/UpdateUserTest.php
similarity index 98%
rename from tests/Feature/Users/UpdateUserTest.php
rename to tests/Feature/Users/Ui/UpdateUserTest.php
index 934fbce2b..bef1d59a0 100644
--- a/tests/Feature/Users/UpdateUserTest.php
+++ b/tests/Feature/Users/Ui/UpdateUserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Users;
+namespace Tests\Feature\Users\Ui;
 
 use App\Models\User;
 use Tests\TestCase;

From e98c3f92c15304874445ac4874273bc4ec1c9dcb Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Jun 2024 10:49:29 -0700
Subject: [PATCH 7/7] Update domain name

---
 tests/Feature/{Reports => Reporting}/CustomReportTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/Feature/{Reports => Reporting}/CustomReportTest.php (99%)

diff --git a/tests/Feature/Reports/CustomReportTest.php b/tests/Feature/Reporting/CustomReportTest.php
similarity index 99%
rename from tests/Feature/Reports/CustomReportTest.php
rename to tests/Feature/Reporting/CustomReportTest.php
index d90e4cb2a..4d11cb23c 100644
--- a/tests/Feature/Reports/CustomReportTest.php
+++ b/tests/Feature/Reporting/CustomReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Reports;
+namespace Tests\Feature\Reporting;
 
 use App\Models\Asset;
 use App\Models\Company;