Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/Api/UsersController.php

@@ -661,7 +661,17 @@ class UsersController extends Controller
                 $user = User::find($request->get('id'));
                 $user->two_factor_secret = null;
                 $user->two_factor_enrolled = 0;
-                $user->save();
+                $user->saveQuietly();
+
+                // Log the reset
+                $logaction = new Actionlog();
+                $logaction->target_type = User::class;
+                $logaction->target_id = $user->id;
+                $logaction->item_type = User::class;
+                $logaction->item_id = $user->id;
+                $logaction->created_at = date('Y-m-d H:i:s');
+                $logaction->user_id = Auth::user()->id;
+                $logaction->logaction('2FA reset');
 
                 return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
             } catch (\Exception $e) {

app/Http/Controllers/Assets/AssetsController.php

@@ -102,6 +102,10 @@ class AssetsController extends Controller
     {
         $this->authorize(Asset::class);
 
+        // There are a lot more rules to add here but prevents
+        // errors around `asset_tags` not being present below.
+        $this->validate($request, ['asset_tags' => ['required', 'array']]);
+
         // Handle asset tags - there could be one, or potentially many.
         // This is only necessary on create, not update, since bulk editing is handled
         // differently

app/Http/Controllers/CustomFieldsController.php

@@ -260,7 +260,7 @@ class CustomFieldsController extends Controller
         
         $field->name          = trim(e($request->get("name")));
         $field->element       = e($request->get("element"));
-        $field->field_values  = e($request->get("field_values"));
+        $field->field_values  = $request->get("field_values");
         $field->user_id       = Auth::id();
         $field->help_text     = $request->get("help_text");
         $field->show_in_email = $show_in_email;

app/Presenters/ActionlogPresenter.php

@@ -42,6 +42,10 @@ class ActionlogPresenter extends Presenter
         // User related icons
         if ($this->itemType() == 'user') {
 
+            if ($this->actionType()=='2fa reset') {
+                return 'fa-solid fa-mobile-screen';
+            }
+
             if ($this->actionType()=='create new') {
                 return 'fa-solid fa-user-plus';
             }
@@ -61,6 +65,7 @@ class ActionlogPresenter extends Presenter
             if ($this->actionType()=='update') {
                 return 'fa-solid fa-user-pen';
             }
+
              return 'fa-solid fa-user';
         }
 

resources/lang/en-US/admin/settings/general.php

@@ -261,7 +261,7 @@ return [
     'two_factor_enrollment'        => 'Two-Factor Enrollment',
     'two_factor_enabled_text'        => 'Enable Two Factor',
     'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
     'two_factor_reset_success'          => 'Two factor device successfully reset',
     'two_factor_reset_error'          => 'Two factor device reset failed',
     'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',

resources/lang/en-US/general.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '2FA_reset'             => '2FA reset',
     'accessories'			=> 'Accessories',
     'activated'			    => 'Activated',
     'accepted_date'         => 'Date Accepted',

resources/views/models/custom_fields_form.blade.php

@@ -9,7 +9,7 @@
               <!-- Listbox -->
               @if ($field->element=='listbox')
                    {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, htmlspecialchars($item->{$field->db_column_name()}, ENT_QUOTES)) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
 
               @elseif ($field->element=='textarea')
                   <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>

resources/views/models/custom_fields_form_bulk_edit.blade.php

@@ -25,7 +25,7 @@
               <!-- Listbox -->
               @if ($field->element=='listbox')
                   {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, htmlspecialchars($item->{$field->db_column_name()}, ENT_QUOTES)) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  Request::old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
 
               @elseif ($field->element=='textarea')
                 @if($field->is_unique)

resources/views/users/edit.blade.php

@@ -499,6 +499,7 @@
                                   </div>
                               @endif
 
+                              @if ((Auth::user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
                                   <!-- Reset Two Factor -->
                                   <div class="form-group">
                                       <div class="col-md-8 col-md-offset-3 two_factor_resetrow">
@@ -513,6 +514,8 @@
                                   </div>
                               @endif
 
+                          @endif
+
                           <!-- Groups -->
                           <div class="form-group{{ $errors->has('groups') ? ' has-error' : '' }}">
                               <label class="col-md-3 control-label" for="groups[]"> {{ trans('general.groups') }}</label>
@@ -702,7 +705,7 @@ $(document).ready(function() {
         $("#two_factor_resetrow").removeClass('success');
         $("#two_factor_resetrow").removeClass('danger');
         $("#two_factor_resetstatus").html('');
-        $("#two_factor_reseticon").html('<i class="fas fa-spinner spin"></i>');
+        $("#two_factor_reseticon").html('<i class="fas fa-spinner spin"></i> ');
         $.ajax({
             url: '{{ route('api.users.two_factor_reset', ['id'=> $user->id]) }}',
             type: 'POST',
@@ -715,13 +718,12 @@ $(document).ready(function() {
 
             success: function (data) {
                 $("#two_factor_reseticon").html('');
-                $("#two_factor_resetstatus").html('<i class="fas fa-check text-success"></i>' + data.message);
+                $("#two_factor_resetstatus").html('<span class="text-success"><i class="fas fa-check"></i> ' + data.message + '</span>');
             },
 
             error: function (data) {
                 $("#two_factor_reseticon").html('');
-                $("#two_factor_reseticon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
+                $("#two_factor_resetstatus").html('<span class="text-danger"><i class="fas fa-exclamation-triangle text-danger"></i> ' + data.message + '</span>');
-                $('#two_factor_resetstatus').text(data.message);
             }
 
 

resources/views/users/view.blade.php

@@ -597,7 +597,7 @@
                             </div>
                           </div>
                           
-                          @if ((Auth::user()->isSuperUser()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
+                          @if ((Auth::user()->isSuperUser()) && ($user->two_factor_active_and_enrolled()) && ($snipeSettings->two_factor_enabled!='0') && ($snipeSettings->two_factor_enabled!=''))
                           
                             <!-- 2FA reset -->
                             <div class="row">

tests/Feature/Api/Accessories/AccessoryCheckoutTest.php

@@ -7,13 +7,10 @@ use App\Models\Actionlog;
 use App\Models\User;
 use App\Notifications\CheckoutAccessoryNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AccessoryCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingOutAccessoryRequiresCorrectPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Assets/AssetCheckinTest.php

@@ -11,13 +11,10 @@ use App\Models\Statuslabel;
 use App\Models\User;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Event;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetCheckinTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingInAssetRequiresCorrectPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Assets/AssetIndexTest.php

@@ -6,13 +6,10 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetIndexTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testAssetIndexReturnsExpectedAssets()
     {
         Asset::factory()->count(3)->create();

tests/Feature/Api/Assets/AssetStoreTest.php

@@ -9,15 +9,11 @@ use App\Models\Location;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
-use Carbon\Carbon;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetStoreTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testRequiresPermissionToCreateAsset()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Assets/AssetsForSelectListTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Assets;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetsForSelectListTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testAssetsCanBeSearchedForByAssetTag()
     {
         Asset::factory()->create(['asset_tag' => '0001']);

tests/Feature/Api/Assets/RequestableAssetsTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Assets;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class RequestableAssetsTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testViewingRequestableAssetsRequiresCorrectPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Components/ComponentIndexTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Components;
 use App\Models\Company;
 use App\Models\Component;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class ComponentIndexTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testComponentIndexAdheresToCompanyScoping()
     {
         [$companyA, $companyB] = Company::factory()->count(2)->create();

tests/Feature/Api/Consumables/ConsumableCheckoutTest.php

@@ -7,13 +7,10 @@ use App\Models\Consumable;
 use App\Models\User;
 use App\Notifications\CheckoutConsumableNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class ConsumableCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingOutConsumableRequiresCorrectPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Consumables/ConsumablesIndexTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Consumables;
 use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class ConsumablesIndexTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testConsumableIndexAdheresToCompanyScoping()
     {
         [$companyA, $companyB] = Company::factory()->count(2)->create();

tests/Feature/Api/Departments/DepartmentIndexTest.php

@@ -5,15 +5,11 @@ namespace Tests\Feature\Api\Departments;
 use App\Models\Company;
 use App\Models\Department;
 use App\Models\User;
-use Illuminate\Routing\Route;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class DepartmentIndexTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testViewingDepartmentIndexRequiresAuthentication()
     {
         $this->getJson(route('api.departments.index'))->assertRedirect();

tests/Feature/Api/Groups/GroupStoreTest.php

@@ -4,13 +4,10 @@ namespace Tests\Feature\Api\Groups;
 
 use App\Models\Group;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class GroupStoreTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testStoringGroupRequiresSuperAdminPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Licenses/LicensesIndexTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Licenses;
 use App\Models\Company;
 use App\Models\License;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class LicensesIndexTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testLicensesIndexAdheresToCompanyScoping()
     {
         [$companyA, $companyB] = Company::factory()->count(2)->create();

tests/Feature/Api/Locations/LocationsForSelectListTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Locations;
 use App\Models\Location;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class LocationsForSelectListTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testGettingLocationListRequiresProperPermission()
     {
         $this->actingAsForApi(User::factory()->create())

tests/Feature/Api/Users/UpdateUserApiTest.php

@@ -3,13 +3,10 @@
 namespace Tests\Feature\Api\Users;
 
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UpdateUserApiTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testApiUsersCanBeActivatedWithNumber()
     {
         $admin = User::factory()->superuser()->create();

tests/Feature/Api/Users/UsersForSelectListTest.php

@@ -6,13 +6,10 @@ use App\Models\Company;
 use App\Models\User;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Laravel\Passport\Passport;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UsersForSelectListTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testUsersAreReturned()
     {
         $users = User::factory()->superuser()->count(3)->create();

tests/Feature/Api/Users/UsersSearchTest.php

@@ -5,13 +5,10 @@ namespace Tests\Feature\Api\Users;
 use App\Models\Company;
 use App\Models\User;
 use Laravel\Passport\Passport;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UsersSearchTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCanSearchByUserFirstAndLastName()
     {
         User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker']);

tests/Feature/Api/Users/UsersUpdateTest.php

@@ -8,13 +8,10 @@ use App\Models\Group;
 use App\Models\Location;
 use App\Models\User;
 use Illuminate\Support\Facades\Hash;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UsersUpdateTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCanUpdateUserViaPatch()
     {
         $admin = User::factory()->superuser()->create();

tests/Feature/Checkins/AccessoryCheckinTest.php

@@ -8,13 +8,10 @@ use App\Models\User;
 use App\Notifications\CheckinAccessoryNotification;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AccessoryCheckinTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingInAccessoryRequiresCorrectPermission()
     {
         $accessory = Accessory::factory()->checkedOutToUser()->create();

tests/Feature/Checkins/AssetCheckinTest.php

@@ -11,13 +11,10 @@ use App\Models\Statuslabel;
 use App\Models\User;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Event;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetCheckinTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingInAssetRequiresCorrectPermission()
     {
         $this->actingAs(User::factory()->create())

tests/Feature/CheckoutAcceptances/AccessoryAcceptanceTest.php

@@ -7,13 +7,10 @@ use App\Models\CheckoutAcceptance;
 use App\Notifications\AcceptanceAssetAcceptedNotification;
 use App\Notifications\AcceptanceAssetDeclinedNotification;
 use Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AccessoryAcceptanceTest extends TestCase
 {
-    use InteractsWithSettings;
-
     /**
      * This can be absorbed into a bigger test
      */

tests/Feature/Checkouts/AccessoryCheckoutTest.php

@@ -7,13 +7,10 @@ use App\Models\Actionlog;
 use App\Models\User;
 use App\Notifications\CheckoutAccessoryNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AccessoryCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingOutAccessoryRequiresCorrectPermission()
     {
         $this->actingAs(User::factory()->create())

tests/Feature/Checkouts/ConsumableCheckoutTest.php

@@ -7,13 +7,10 @@ use App\Models\Consumable;
 use App\Models\User;
 use App\Notifications\CheckoutConsumableNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class ConsumableCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testCheckingOutConsumableRequiresCorrectPermission()
     {
         $this->actingAs(User::factory()->create())

tests/Feature/Checkouts/LicenseCheckoutTest.php

@@ -6,13 +6,10 @@ use App\Models\Asset;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class LicenseCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testNotesAreStoredInActionLogOnCheckoutToAsset()
     {
         $admin = User::factory()->superuser()->create();

tests/Feature/DashboardTest.php

@@ -3,13 +3,10 @@
 namespace Tests\Feature;
 
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class DashboardTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testUsersWithoutAdminAccessAreRedirected()
     {
         $this->actingAs(User::factory()->create())

tests/Feature/Notifications/Email/EmailNotificationsUponCheckinTest.php

@@ -7,7 +7,6 @@ use App\Models\Asset;
 use App\Models\User;
 use App\Notifications\CheckinAssetNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 /**
@@ -15,8 +14,6 @@ use Tests\TestCase;
  */
 class EmailNotificationsUponCheckinTest extends TestCase
 {
-    use InteractsWithSettings;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckinTest.php

@@ -14,7 +14,6 @@ use App\Notifications\CheckinAssetNotification;
 use App\Notifications\CheckinLicenseSeatNotification;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 /**
@@ -22,8 +21,6 @@ use Tests\TestCase;
  */
 class SlackNotificationsUponCheckinTest extends TestCase
 {
-    use InteractsWithSettings;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/Feature/Notifications/Webhooks/SlackNotificationsUponCheckoutTest.php

@@ -16,7 +16,6 @@ use App\Notifications\CheckoutConsumableNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 /**
@@ -24,8 +23,6 @@ use Tests\TestCase;
  */
 class SlackNotificationsUponCheckoutTest extends TestCase
 {
-    use InteractsWithSettings;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/Feature/Reports/CustomReportTest.php

@@ -8,14 +8,10 @@ use App\Models\User;
 use Illuminate\Testing\TestResponse;
 use League\Csv\Reader;
 use PHPUnit\Framework\Assert;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
-
 class CustomReportTest extends TestCase
 {
-    use InteractsWithSettings;
-
     protected function setUp(): void
     {
         parent::setUp();

tests/Feature/Users/UpdateUserTest.php

@@ -3,13 +3,10 @@
 namespace Tests\Feature\Users;
 
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class UpdateUserTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testUsersCanBeActivatedWithNumber()
     {
         $admin = User::factory()->superuser()->create();

tests/Support/InitializesSettings.php

@@ -4,7 +4,7 @@ namespace Tests\Support;
 
 use App\Models\Setting;
 
-trait InteractsWithSettings
+trait InitializesSettings
 {
     protected Settings $settings;
 

tests/TestCase.php

@@ -9,7 +9,7 @@ use RuntimeException;
 use Tests\Support\AssertsAgainstSlackNotifications;
 use Tests\Support\CustomTestMacros;
 use Tests\Support\InteractsWithAuthentication;
-use Tests\Support\InteractsWithSettings;
+use Tests\Support\InitializesSettings;
 
 abstract class TestCase extends BaseTestCase
 {
@@ -17,6 +17,7 @@ abstract class TestCase extends BaseTestCase
     use CreatesApplication;
     use CustomTestMacros;
     use InteractsWithAuthentication;
+    use InitializesSettings;
     use LazilyRefreshDatabase;
 
     private array $globallyDisabledMiddleware = [
@@ -25,20 +26,23 @@ abstract class TestCase extends BaseTestCase
 
     protected function setUp(): void
     {
-        if (!file_exists(realpath(__DIR__ . '/../') . '/.env.testing')) {
+        $this->guardAgainstMissingEnv();
-            throw new RuntimeException(
-                '.env.testing file does not exist. Aborting to avoid wiping your local database'
-            );
-        }
 
         parent::setUp();
 
+        $this->registerCustomMacros();
+
         $this->withoutMiddleware($this->globallyDisabledMiddleware);
 
-        if (collect(class_uses_recursive($this))->contains(InteractsWithSettings::class)) {
         $this->initializeSettings();
     }
 
-        $this->registerCustomMacros();
+    private function guardAgainstMissingEnv(): void
+    {
+        if (!file_exists(realpath(__DIR__ . '/../') . '/.env.testing')) {
+            throw new RuntimeException(
+                '.env.testing file does not exist. Aborting to avoid wiping your local database.'
+            );
+        }
     }
 }

tests/Unit/AssetMaintenanceTest.php

@@ -2,14 +2,10 @@
 namespace Tests\Unit;
 
 use App\Models\AssetMaintenance;
-use Carbon\Carbon;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetMaintenanceTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testZerosOutWarrantyIfBlank()
     {
         $c = new AssetMaintenance;

tests/Unit/AssetModelTest.php

@@ -4,13 +4,10 @@ namespace Tests\Unit;
 use App\Models\Asset;
 use App\Models\Category;
 use App\Models\AssetModel;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetModelTest extends TestCase
 {
-    use InteractsWithSettings;
-    
     public function testAnAssetModelContainsAssets()
     {
         $category = Category::factory()->create([

tests/Unit/AssetTest.php

@@ -5,13 +5,10 @@ use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
 use Carbon\Carbon;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class AssetTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testAutoIncrement()
     {
         $this->settings->enableAutoIncrement();

tests/Unit/CategoryTest.php

@@ -4,13 +4,10 @@ namespace Tests\Unit;
 use App\Models\Category;
 use App\Models\AssetModel;
 use App\Models\Asset;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class CategoryTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testFailsEmptyValidation()
     {
         // An Asset requires a name, a qty, and a category_id.

tests/Unit/CompanyScopingTest.php

@@ -12,13 +12,10 @@ use App\Models\License;
 use App\Models\LicenseSeat;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Model;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class CompanyScopingTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function models(): array
     {
         return [

tests/Unit/ComponentTest.php

@@ -5,13 +5,10 @@ use App\Models\Category;
 use App\Models\Company;
 use App\Models\Component;
 use App\Models\Location;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class ComponentTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testAComponentBelongsToACompany()
     {
         $component = Component::factory()

tests/Unit/DepreciationTest.php

@@ -5,13 +5,10 @@ use App\Models\Depreciation;
 use App\Models\Category;
 use App\Models\License;
 use App\Models\AssetModel;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class DepreciationTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testADepreciationHasModels()
     {
         $depreciation = Depreciation::factory()->create();

tests/Unit/LdapTest.php

@@ -3,8 +3,6 @@
 namespace Tests\Unit;
 
 use App\Models\Ldap;
-use Exception;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 /**
@@ -12,7 +10,6 @@ use Tests\TestCase;
  */
 class LdapTest extends TestCase
 {
-    use InteractsWithSettings;
     use \phpmock\phpunit\PHPMock;
 
     public function testConnect()

tests/Unit/Models/Company/GetIdForCurrentUserTest.php

@@ -4,13 +4,10 @@ namespace Tests\Unit\Models\Company;
 
 use App\Models\Company;
 use App\Models\User;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class GetIdForCurrentUserTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testReturnsProvidedValueWhenFullCompanySupportDisabled()
     {
         $this->settings->disableMultipleFullCompanySupport();

tests/Unit/NotificationTest.php

@@ -8,13 +8,10 @@ use App\Models\Category;
 use Carbon\Carbon;
 use App\Notifications\CheckoutAssetNotification;
 use Illuminate\Support\Facades\Notification;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class NotificationTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
     {
         $admin = User::factory()->superuser()->create();

tests/Unit/SnipeModelTest.php

@@ -2,13 +2,10 @@
 namespace Tests\Unit;
 
 use App\Models\SnipeModel;
-use Tests\Support\InteractsWithSettings;
 use Tests\TestCase;
 
 class SnipeModelTest extends TestCase
 {
-    use InteractsWithSettings;
-
     public function testSetsPurchaseDatesAppropriately()
     {
         $c = new SnipeModel;