Merge pull request #14825 from marcusmoore/chore/test-organization

Re-organized test suite
snipe · Jun 5, 2024 · 697ac83 · 697ac83
2 parents a742105 + e98c3f9
commit 697ac83
Show file tree

Hide file tree

Showing 31 changed files with 117 additions and 131 deletions.
diff --git a/tests/Feature/Api/Users/UsersUpdateTest.php b/tests/Feature/Api/Users/UsersUpdateTest.php
diff --git a/tests/Feature/Api/Assets/AssetIndexTest.php → tests/Feature/Assets/Api/AssetIndexTest.php b/tests/Feature/Api/Assets/AssetIndexTest.php → 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/...re/Api/Assets/AssetsForSelectListTest.php → ...re/Assets/Api/AssetsForSelectListTest.php b/...re/Api/Assets/AssetsForSelectListTest.php → ...re/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/...ture/Api/Assets/RequestableAssetsTest.php → ...ature/Assets/Api/RequestableAssetTest.php b/...ture/Api/Assets/RequestableAssetsTest.php → ...ature/Assets/Api/RequestableAssetTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 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/Assets/AssetStoreTest.php → tests/Feature/Assets/Api/StoreAssetTest.php b/tests/Feature/Api/Assets/AssetStoreTest.php → 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,10 +12,9 @@
 use App\Models\User;
 use Illuminate\Support\Facades\Crypt;
 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 → tests/Feature/Assets/Api/UpdateAssetTest.php b/tests/Feature/Api/Assets/AssetUpdateTest.php → tests/Feature/Assets/Api/UpdateAssetTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Assets\Api;
 
 use App\Models\Asset;
 use App\Models\CustomField;
 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/Assets/AssetsBulkEditTest.php → .../Feature/Assets/Ui/BulkEditAssetsTest.php b/tests/Feature/Assets/AssetsBulkEditTest.php → .../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;
@@ -12,7 +12,7 @@
 use Illuminate\Support\Facades\Crypt;
 use Tests\TestCase;
 
-class AssetsBulkEditTest extends TestCase
+class BulkEditAssetsTest extends TestCase
 {
     public function testUserWithPermissionsCanAccessPage()
     {

diff --git a/...s/Feature/Api/Assets/AssetCheckinTest.php → ...Feature/Checkins/Api/AssetCheckinTest.php b/...s/Feature/Api/Assets/AssetCheckinTest.php → ...Feature/Checkins/Api/AssetCheckinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Checkins\Api;
 
 use App\Events\CheckoutableCheckedIn;
 use App\Models\Asset;

diff --git a/...Feature/Checkins/AccessoryCheckinTest.php → ...ture/Checkins/Ui/AccessoryCheckinTest.php b/...Feature/Checkins/AccessoryCheckinTest.php → ...ture/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 → .../Feature/Checkins/Ui/AssetCheckinTest.php b/tests/Feature/Checkins/AssetCheckinTest.php → .../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/...utAcceptances/AccessoryAcceptanceTest.php → ...cceptances/Ui/AccessoryAcceptanceTest.php b/...utAcceptances/AccessoryAcceptanceTest.php → ...cceptances/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/...Api/Accessories/AccessoryCheckoutTest.php → ...e/Checkouts/Api/AccessoryCheckoutTest.php b/...Api/Accessories/AccessoryCheckoutTest.php → ...e/Checkouts/Api/AccessoryCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Accessories;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Accessory;
 use App\Models\Actionlog;

diff --git a/.../Feature/Api/Assets/AssetCheckoutTest.php → ...ature/Checkouts/Api/AssetCheckoutTest.php b/.../Feature/Api/Assets/AssetCheckoutTest.php → ...ature/Checkouts/Api/AssetCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Assets;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Events\CheckoutableCheckedOut;
 use App\Models\Asset;

diff --git a/...pi/Consumables/ConsumableCheckoutTest.php → .../Checkouts/Api/ConsumableCheckoutTest.php b/...pi/Consumables/ConsumableCheckoutTest.php → .../Checkouts/Api/ConsumableCheckoutTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Checkouts\Api;
 
 use App\Models\Actionlog;
 use App\Models\Consumable;

diff --git a/...ature/Checkouts/AccessoryCheckoutTest.php → ...re/Checkouts/Ui/AccessoryCheckoutTest.php b/...ature/Checkouts/AccessoryCheckoutTest.php → ...re/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/...s/Feature/Checkouts/AssetCheckoutTest.php → ...eature/Checkouts/Ui/AssetCheckoutTest.php b/...s/Feature/Checkouts/AssetCheckoutTest.php → ...eature/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/...ture/Checkouts/ConsumableCheckoutTest.php → ...e/Checkouts/Ui/ConsumableCheckoutTest.php b/...ture/Checkouts/ConsumableCheckoutTest.php → ...e/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/...Feature/Checkouts/LicenseCheckoutTest.php → ...ture/Checkouts/Ui/LicenseCheckoutTest.php b/...Feature/Checkouts/LicenseCheckoutTest.php → ...ture/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/...ure/Api/Components/ComponentIndexTest.php → ...ure/Components/Api/ComponentIndexTest.php b/...ure/Api/Components/ComponentIndexTest.php → ...ure/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/.../Api/Consumables/ConsumablesIndexTest.php → ...e/Consumables/Api/ConsumableIndexTest.php b/.../Api/Consumables/ConsumablesIndexTest.php → ...e/Consumables/Api/ConsumableIndexTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Consumables;
+namespace Tests\Feature\Consumables\Api;
 
 use App\Models\Company;
 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/...e/Api/Departments/DepartmentIndexTest.php → ...e/Departments/Api/DepartmentIndexTest.php b/...e/Api/Departments/DepartmentIndexTest.php → ...e/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/GroupStoreTest.php → tests/Feature/Groups/Api/StoreGroupTest.php b/tests/Feature/Api/Groups/GroupStoreTest.php → tests/Feature/Groups/Api/StoreGroupTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Groups;
+namespace Tests\Feature\Groups\Api;
 
 use App\Helpers\Helper;
 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/...eature/Api/Licenses/LicensesIndexTest.php → ...Feature/Licenses/Api/LicenseIndexTest.php b/...eature/Api/Licenses/LicensesIndexTest.php → ...Feature/Licenses/Api/LicenseIndexTest.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Tests\Feature\Api\Licenses;
+namespace Tests\Feature\Licenses\Api;
 
 use App\Models\Company;
 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/.../Locations/LocationsForSelectListTest.php → ...ations/Api/LocationsForSelectListTest.php b/.../Locations/LocationsForSelectListTest.php → ...ations/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/Reports/CustomReportTest.php → tests/Feature/Reporting/CustomReportTest.php b/tests/Feature/Reports/CustomReportTest.php → 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;

diff --git a/tests/Feature/Api/Users/DeleteUsersTest.php → tests/Feature/Users/Api/DeleteUserTest.php b/tests/Feature/Api/Users/DeleteUsersTest.php → tests/Feature/Users/Api/DeleteUserTest.php
@@ -1,15 +1,14 @@
 <?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 DeleteUsersTest extends TestCase
+class DeleteUserTest extends TestCase
 {