@fleetbase/fleetops-engine 0.6.68 → 0.6.70

package/server/tests/Feature/Http/Internal/DriverControllerExistingUserAdoptionTest.php

@@ -25,12 +25,13 @@ use Illuminate\Support\MessageBag;
 use Illuminate\Support\Str;
 
 /**
- * Covers the internal DriverController createRecord unique-conflict branch
- * against SQLite with a failing validator: adopting an existing
- * organization member by creating a driver profile, returning the existing
- * driver profile when one already exists, assigning non-members to the
- * company, and falling through to the validation error response when the
- * conflict is not a phone or email collision.
+ * Covers how the internal DriverController createRecord resolves the new
+ * driver's login account through ProfileAccountManager against SQLite with
+ * real spatie roles: creating a managed driver account without an invite,
+ * linking a staff member of the organization without touching their role,
+ * linking a managed driver account of another organization, rejecting an
+ * email/phone held by another organization's staff, another profile type or
+ * an existing driver of the organization, and returning validation failures.
  */
 if (!function_exists('Fleetbase\Observers\event')) {
     eval('namespace Fleetbase\Observers; function event($event = null, $payload = []) { return []; }');
@@ -212,6 +213,28 @@ function fleetopsDriverAdoptionBoot(array $validatorErrors): SQLiteConnection
         }
     });
     Illuminate\Support\Facades\DB::clearResolvedInstance('db');
+    app()->instance('hash', new class implements Illuminate\Contracts\Hashing\Hasher {
+        public function info($hashedValue): array
+        {
+            return [];
+        }
+
+        public function make($value, array $options = []): string
+        {
+            return 'hashed:' . $value;
+        }
+
+        public function check($value, $hashedValue, array $options = []): bool
+        {
+            return 'hashed:' . $value === $hashedValue;
+        }
+
+        public function needsRehash($hashedValue, array $options = []): bool
+        {
+            return false;
+        }
+    });
+    Illuminate\Support\Facades\Hash::clearResolvedInstance('hash');
 
     $schema = $connection->getSchemaBuilder();
     $tables = [
@@ -327,66 +350,121 @@ function fleetopsDriverAdoptionRequest(array $driver): Request
     return Request::create('/int/v1/drivers', 'POST', ['driver' => $driver]);
 }
 
-test('phone conflicts adopt existing organization members as drivers', function () {
-    $connection = fleetopsDriverAdoptionBoot(['phone' => ['The phone has already been taken.']]);
-    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111111', 'company_uuid' => 'company-1', 'name' => 'Member', 'phone' => '+6591234567', 'slug' => 'member', 'type' => 'driver']);
-    $connection->table('company_users')->insert(['uuid' => 'cu-1', 'company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111111']);
+function fleetopsDriverAdoptionRoles(SQLiteConnection $connection, string $userUuid): array
+{
+    return $connection->table('model_has_roles')
+        ->join('roles', 'roles.id', '=', 'model_has_roles.role_id')
+        ->join('company_users', 'company_users.uuid', '=', 'model_has_roles.model_uuid')
+        ->where('company_users.user_uuid', $userUuid)
+        ->pluck('roles.name')
+        ->unique()
+        ->values()
+        ->all();
+}
+
+test('a new driver gets a managed driver account added to the company without an invite', function () {
+    $connection = fleetopsDriverAdoptionBoot([]);
 
     $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name'  => 'Member',
-        'phone' => '+6591234567',
+        'name'     => 'New Driver',
+        'email'    => 'New.Driver@Example.com',
+        'phone'    => '+65 9123-0000',
+        'password' => 'chosen-secret',
     ]));
 
+    $user = $connection->table('users')->first();
+
     expect($result)->toBeArray()
-        ->and($result['driver']->resource->user_uuid)->toBe('11111111-1111-4111-8111-111111111111')
-        ->and($connection->table('drivers')->count())->toBe(1)
-        ->and($connection->table('drivers')->value('company_uuid'))->toBe('company-1');
+        ->and($result['driver']->resource->user_uuid)->toBe($user->uuid)
+        ->and($user->type)->toBe('driver')
+        ->and($user->status)->toBe('active')
+        ->and($user->email)->toBe('new.driver@example.com')
+        ->and($user->phone)->toBe('+6591230000')
+        ->and($user->password)->toBe('hashed:chosen-secret')
+        ->and($connection->table('company_users')->where(['company_uuid' => 'company-1', 'user_uuid' => $user->uuid])->count())->toBe(1)
+        ->and(fleetopsDriverAdoptionRoles($connection, $user->uuid))->toBe(['Driver'])
+        ->and($connection->table('invites')->count())->toBe(0);
 });
 
-test('phone conflicts assign non members to the session company', function () {
-    $connection = fleetopsDriverAdoptionBoot(['phone' => ['The phone has already been taken.']]);
-
-    // Same conflict as above, but with no company_users row the user is not yet
-    // an organization member, so adoption must also attach them to the company
-    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111112', 'name' => 'Outsider', 'phone' => '+6591234568', 'slug' => 'outsider', 'type' => 'driver']);
-
-    expect($connection->table('company_users')->count())->toBe(0);
+test('a staff member of the organization is linked without changing their account or role', function () {
+    $connection = fleetopsDriverAdoptionBoot([]);
+    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111111', 'company_uuid' => 'company-1', 'name' => 'Staff Member', 'email' => 'staff@example.com', 'phone' => '+6590001111', 'slug' => 'staff', 'type' => 'user']);
 
     $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name'  => 'Outsider',
-        'phone' => '+6591234568',
+        'name'  => 'Different Name',
+        'email' => 'staff@example.com',
+        'phone' => '+6599998888',
     ]));
 
+    $staff = $connection->table('users')->where('uuid', '11111111-1111-4111-8111-111111111111')->first();
+
     expect($result)->toBeArray()
-        ->and($result['driver']->resource->user_uuid)->toBe('11111111-1111-4111-8111-111111111112')
-        ->and($connection->table('drivers')->count())->toBe(1)
-        // the assignCompany branch ran: the user is now a member of company-1
-        ->and($connection->table('company_users')->where([
-            'company_uuid' => 'company-1',
-            'user_uuid'    => '11111111-1111-4111-8111-111111111112',
-        ])->count())->toBe(1);
+        ->and($result['driver']->resource->user_uuid)->toBe('11111111-1111-4111-8111-111111111111')
+        ->and($connection->table('users')->count())->toBe(1)
+        ->and($staff->type)->toBe('user')
+        ->and($staff->phone)->toBe('+6590001111')
+        ->and($staff->name)->toBe('Staff Member')
+        ->and($connection->table('model_has_roles')->count())->toBe(0)
+        ->and($connection->table('drivers')->value('company_uuid'))->toBe('company-1');
 });
 
-test('email conflicts return the existing driver profile when present', function () {
-    $connection = fleetopsDriverAdoptionBoot(['email' => ['The email has already been taken.']]);
-    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111111', 'company_uuid' => 'company-1', 'name' => 'Member', 'email' => 'member@example.com', 'type' => 'driver']);
-    $connection->table('drivers')->insert(['uuid' => 'driver-1', 'company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111111']);
+test('a managed driver account of another organization is linked and joins the company', function () {
+    $connection = fleetopsDriverAdoptionBoot([]);
+    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111112', 'company_uuid' => 'company-2', 'name' => 'Shared Driver', 'phone' => '+6591234568', 'slug' => 'shared', 'type' => 'driver']);
+    $connection->table('drivers')->insert(['uuid' => 'driver-elsewhere', 'company_uuid' => 'company-2', 'user_uuid' => '11111111-1111-4111-8111-111111111112']);
 
     $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name'  => 'Member',
-        'email' => 'member@example.com',
+        'name'  => 'Shared Driver',
+        'phone' => '+6591234568',
     ]));
 
     expect($result)->toBeArray()
-        ->and($result['driver']->resource->uuid)->toBe('driver-1')
-        ->and($connection->table('drivers')->count())->toBe(1);
+        ->and($result['driver']->resource->user_uuid)->toBe('11111111-1111-4111-8111-111111111112')
+        ->and($connection->table('drivers')->where('company_uuid', 'company-1')->count())->toBe(1)
+        ->and($connection->table('company_users')->where(['company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111112'])->count())->toBe(1)
+        ->and(fleetopsDriverAdoptionRoles($connection, '11111111-1111-4111-8111-111111111112'))->toBe(['Driver'])
+        ->and($connection->table('invites')->count())->toBe(0);
 });
 
-test('non phone or email conflicts fall through to the error response', function () {
+test('an email or phone that cannot be linked is rejected with a 422', function (array $user, ?array $driver, array $input, string $message) {
+    $connection = fleetopsDriverAdoptionBoot([]);
+    $connection->table('users')->insert(array_merge(['uuid' => '11111111-1111-4111-8111-111111111111', 'name' => 'Existing'], $user));
+    if ($driver) {
+        $connection->table('drivers')->insert($driver);
+    }
+
+    $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest(array_merge(['name' => 'New Driver'], $input)));
+
+    expect($result)->toBeInstanceOf(Illuminate\Http\JsonResponse::class)
+        ->and($result->getStatusCode())->toBe(422)
+        ->and($result->getData(true)['error'])->toBe($message)
+        ->and($connection->table('drivers')->where('company_uuid', 'company-1')->where('user_uuid', '!=', '11111111-1111-4111-8111-111111111111')->count())->toBe(0)
+        ->and($connection->table('users')->count())->toBe(1);
+})->with([
+    'staff of another organization' => [
+        ['company_uuid' => 'company-2', 'email' => 'outsider@example.com', 'type' => 'admin'],
+        null,
+        ['email' => 'outsider@example.com'],
+        'This email is already in use by another account.',
+    ],
+    'a customer account' => [
+        ['company_uuid' => 'company-1', 'phone' => '+6591112222', 'type' => 'customer'],
+        null,
+        ['phone' => '+6591112222'],
+        'This phone number is already used by a customer.',
+    ],
+    'an existing driver of the organization' => [
+        ['company_uuid' => 'company-1', 'email' => 'member@example.com', 'type' => 'driver'],
+        ['uuid'  => 'driver-1', 'company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111111'],
+        ['email' => 'member@example.com'],
+        'A driver with this email already exists.',
+    ],
+]);
+
+test('validation failures return the error response', function () {
     fleetopsDriverAdoptionBoot(['name' => ['The name field is required.']]);
 
-    // The error response seam raises the validation failure once the
-    // fall-through branch executes
+    // The error response seam raises the validation failure
     $failure = null;
 
     try {
@@ -398,104 +476,67 @@ test('non phone or email conflicts fall through to the error response', function
     expect($failure?->errors())->toBe(['name' => ['The name field is required.']]);
 });
 
-test('valid create requests build the driver user and profile', function () {
-    $connection = fleetopsDriverAdoptionBoot([]);
-
-    putenv('DEBUG=1');
-    $_ENV['DEBUG'] = $_SERVER['DEBUG'] = '1';
-    $result        = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name'  => 'Fresh Driver',
-        'email' => 'fresh@example.com',
-        'phone' => '+6590001111',
-    ]));
+function fleetopsDriverAdoptionThrowingHasher(Throwable $exception): void
+{
+    $GLOBALS['fleetopsDriverAdoptionHashException'] = $exception;
+    app()->instance('hash', new class implements Illuminate\Contracts\Hashing\Hasher {
+        public function info($hashedValue): array
+        {
+            return [];
+        }
 
-    expect($result)->toBeArray()->toHaveKey('driver')
-        ->and($connection->table('users')->where('email', 'fresh@example.com')->value('type'))->toBe('driver')
-        ->and($connection->table('drivers')->whereNotNull('user_uuid')->count())->toBe(1)
-        ->and($connection->table('model_has_roles')->count())->toBeGreaterThanOrEqual(1);
-});
+        public function make($value, array $options = []): string
+        {
+            throw $GLOBALS['fleetopsDriverAdoptionHashException'];
+        }
 
-test('valid update requests refresh driver and user details', function () {
-    $connection = fleetopsDriverAdoptionBoot([]);
-    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111111', 'company_uuid' => 'company-1', 'name' => 'Old Name', 'email' => 'old@example.com', 'type' => 'driver']);
-    $connection->table('drivers')->insert(['uuid' => '22222222-2222-4222-8222-222222222222', 'public_id' => 'driver_updone1', 'company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111111']);
-
-    $request = Request::create('/int/v1/drivers/driver_updone1', 'PUT', ['driver' => [
-        'name'   => 'New Name',
-        'status' => 'active',
-    ]]);
-    $request->setRouteResolver(function () {
-        return new class {
-            public function getAction($key = null)
-            {
-                return $key === null ? ['controller' => DriverController::class . '@updateRecord'] : DriverController::class . '@updateRecord';
-            }
+        public function check($value, $hashedValue, array $options = []): bool
+        {
+            return false;
+        }
 
-            public function getActionMethod()
-            {
-                return 'updateRecord';
-            }
+        public function needsRehash($hashedValue, array $options = []): bool
+        {
+            return false;
+        }
+    });
+    Illuminate\Support\Facades\Hash::clearResolvedInstance('hash');
+}
 
-            public function getName()
-            {
-                return 'internal.drivers.update';
-            }
+test('create record reports a missing organization', function () {
+    fleetopsDriverAdoptionBoot([]);
+    session(['company' => 'company-missing']);
 
-            public function uri()
-            {
-                return 'int/v1/drivers/{id}';
-            }
+    $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest(['name' => 'Nowhere Driver']));
 
-            public function parameters()
-            {
-                return ['id' => 'driver_updone1'];
-            }
+    expect($result->getData(true))->toBe(['error' => 'Unable to create driver.']);
+});
 
-            public function parameter($name = null, $default = null)
-            {
-                return $name === 'id' ? 'driver_updone1' : $default;
-            }
-        };
-    });
+test('create record syncs custom field values onto the new driver', function () {
+    $connection = fleetopsDriverAdoptionBoot([]);
+    $connection->table('custom_fields')->insert(['uuid' => 'dddddddd-dddd-4ddd-8ddd-dddddddddddd', 'company_uuid' => 'company-1', 'name' => 'badge', 'label' => 'Badge']);
 
-    $result = (new DriverController())->updateRecord($request, 'driver_updone1');
+    $result = (new DriverController())->createRecord(Request::create('/int/v1/drivers', 'POST', ['driver' => [
+        'name'                => 'Badged Driver',
+        'custom_field_values' => [['custom_field_uuid' => 'dddddddd-dddd-4ddd-8ddd-dddddddddddd', 'value' => 'B-12']],
+    ]]));
 
-    expect($result)->toBeArray()->toHaveKey('driver')
-        ->and($connection->table('users')->value('name'))->toBe('New Name')
-        ->and($connection->table('drivers')->value('status'))->toBe('available');
+    expect($result)->toBeArray()
+        ->and($connection->table('custom_field_values')->where('subject_uuid', $result['driver']->resource->uuid)->value('value'))->toBe('B-12');
 });
 
-test('create with user uuids provisions users guards conflicts and companies', function () {
+test('create record reports database and request validation failures', function () {
     $connection = fleetopsDriverAdoptionBoot([]);
-    Illuminate\Support\Facades\Cache::clearResolvedInstance('cache');
+    $connection->getSchemaBuilder()->drop('drivers');
 
-    // Unknown user uuids provision a fresh user with generated credentials
-    $created = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'user_uuid'  => '99999999-9999-4999-8999-999999999901',
-        'name'       => 'Provisioned Driver',
-        'email'      => 'provisioned@example.com',
-        'phone'      => '+6591112222',
-        'photo_uuid' => '99999999-9999-4999-8999-999999999902',
-    ]));
-    expect($created)->toBeArray()->toHaveKey('driver')
-        ->and($connection->table('users')->where('email', 'provisioned@example.com')->count())->toBe(1)
-        ->and($connection->table('users')->where('email', 'provisioned@example.com')->value('avatar_uuid'))->toBe('99999999-9999-4999-8999-999999999902');
-
-    // Users already holding a driver profile in the company are rejected
-    $existingUserUuid = $connection->table('users')->where('email', 'provisioned@example.com')->value('uuid');
-    $conflict         = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'user_uuid' => $existingUserUuid,
-        'name'      => 'Duplicate Driver',
-    ]));
-    expect($conflict->getData(true)['error'] ?? '')->toContain('already belongs');
+    // The account is created before the driver row fails to insert
+    $queryFailure = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest(['name' => 'Tableless Driver']));
+    expect($queryFailure->getData(true)['error'])->toContain('drivers');
 
-    // Without a session company driver creation fails outright
-    session(['company' => null]);
-    $noCompany = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name' => 'Companyless Driver',
-    ]));
-    expect($noCompany->getData(true)['error'] ?? '')->toContain('Unable to create driver');
-    session(['company' => 'company-1']);
+    fleetopsDriverAdoptionThrowingHasher(new Fleetbase\Exceptions\FleetbaseRequestValidationException(['password' => ['The password is too weak.']]));
+    $validationFailure = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest(['name' => 'Weak Password', 'password' => 'weak-password']));
+
+    expect($validationFailure->getData(true))->toBe(['error' => ['password' => ['The password is too weak.']]]);
 });
 
 test('auth can resolves real permissions for requests and ping guards', function () {
@@ -558,153 +599,3 @@ test('auth can resolves real permissions for requests and ping guards', function
 
     session(['user' => null]);
 });
-
-function fleetopsDriverAdoptionUpdateRequest(string $publicId, array $driver): Request
-{
-    $request = Request::create('/int/v1/drivers/' . $publicId, 'PUT', ['driver' => $driver]);
-    $request->setRouteResolver(function () use ($publicId) {
-        return new class($publicId) {
-            public function __construct(private string $publicId)
-            {
-            }
-
-            public function getAction($key = null)
-            {
-                return $key === null ? ['controller' => DriverController::class . '@updateRecord'] : DriverController::class . '@updateRecord';
-            }
-
-            public function getActionMethod()
-            {
-                return 'updateRecord';
-            }
-
-            public function getName()
-            {
-                return 'internal.drivers.update';
-            }
-
-            public function uri()
-            {
-                return 'int/v1/drivers/{id}';
-            }
-
-            public function parameters()
-            {
-                return ['id' => $this->publicId];
-            }
-
-            public function parameter($name = null, $default = null)
-            {
-                return $name === 'id' ? $this->publicId : $default;
-            }
-        };
-    });
-
-    return $request;
-}
-
-test('creation applies photo avatars and syncs custom field values', function () {
-    $connection = fleetopsDriverAdoptionBoot([]);
-    $connection->table('custom_fields')->insert(['uuid' => '33333333-3333-4333-8333-333333333301', 'company_uuid' => 'company-1', 'name' => 'badge_number', 'label' => 'Badge Number']);
-
-    $result = (new DriverController())->createRecord(fleetopsDriverAdoptionRequest([
-        'name'                => 'Photographed Driver',
-        'email'               => 'photographed@example.com',
-        'phone'               => '+6590002222',
-        'photo_uuid'          => '44444444-4444-4444-8444-444444444401',
-        'custom_field_values' => [
-            ['custom_field_uuid' => '33333333-3333-4333-8333-333333333301', 'value' => 'BADGE-7', 'value_type' => 'text'],
-        ],
-    ]));
-
-    expect($result)->toBeArray()->toHaveKey('driver')
-        ->and($connection->table('users')->where('email', 'photographed@example.com')->value('avatar_uuid'))->toBe('44444444-4444-4444-8444-444444444401')
-        ->and($connection->table('custom_field_values')->where('value', 'BADGE-7')->count())->toBe(1);
-});
-
-test('creation maps query and validation failures onto error responses', function () {
-    fleetopsDriverAdoptionBoot([]);
-
-    // Query failures from the persistence pipeline report a generic message
-    $queryFailure         = new DriverController();
-    $queryFailure->model  = new class extends Fleetbase\FleetOps\Models\Driver {
-        public function createRecordFromRequest($request, ?callable $onBefore = null, ?callable $onAfter = null, array $options = [])
-        {
-            throw new Illuminate\Database\QueryException('mysql', 'insert into drivers', [], new RuntimeException('constraint violation'));
-        }
-    };
-    $queryResponse = $queryFailure->createRecord(fleetopsDriverAdoptionRequest(['name' => 'Query Failure']));
-    expect($queryResponse->getData(true)['error'] ?? '')->not->toBeEmpty();
-
-    // Validation exceptions surface their individual error messages
-    $validationFailure        = new DriverController();
-    $validationFailure->model = new class extends Fleetbase\FleetOps\Models\Driver {
-        public function createRecordFromRequest($request, ?callable $onBefore = null, ?callable $onAfter = null, array $options = [])
-        {
-            throw new Fleetbase\Exceptions\FleetbaseRequestValidationException(['The name field is required.']);
-        }
-    };
-    $validationResponse = $validationFailure->createRecord(fleetopsDriverAdoptionRequest(['name' => 'Validation Failure']));
-    expect($validationResponse->getData(true)['error'])->toBe(['The name field is required.']);
-});
-
-test('updates apply photo avatars and sync custom field values', function () {
-    $connection = fleetopsDriverAdoptionBoot([]);
-    $connection->table('users')->insert(['uuid' => '11111111-1111-4111-8111-111111111121', 'company_uuid' => 'company-1', 'name' => 'Photo Driver', 'email' => 'photodriver@example.com', 'type' => 'driver']);
-    $connection->table('drivers')->insert(['uuid' => '22222222-2222-4222-8222-222222222221', 'public_id' => 'driver_photoone', 'company_uuid' => 'company-1', 'user_uuid' => '11111111-1111-4111-8111-111111111121']);
-    $connection->table('custom_fields')->insert(['uuid' => '33333333-3333-4333-8333-333333333302', 'company_uuid' => 'company-1', 'name' => 'route_code', 'label' => 'Route Code']);
-
-    $result = (new DriverController())->updateRecord(fleetopsDriverAdoptionUpdateRequest('driver_photoone', [
-        'name'                => 'Photo Driver Updated',
-        'photo_uuid'          => '44444444-4444-4444-8444-444444444402',
-        'custom_field_values' => [
-            ['custom_field_uuid' => '33333333-3333-4333-8333-333333333302', 'value' => 'ROUTE-9', 'value_type' => 'text'],
-        ],
-    ]), 'driver_photoone');
-
-    expect($result)->toBeArray()->toHaveKey('driver')
-        ->and($connection->table('users')->where('uuid', '11111111-1111-4111-8111-111111111121')->value('avatar_uuid'))->toBe('44444444-4444-4444-8444-444444444402')
-        ->and($connection->table('custom_field_values')->where('value', 'ROUTE-9')->count())->toBe(1);
-});
-
-test('updates map validation and generic failures onto error responses', function () {
-    fleetopsDriverAdoptionBoot([]);
-
-    // Validation exceptions from the pipeline surface their error list
-    $validationFailure        = new DriverController();
-    $validationFailure->model = new class extends Fleetbase\FleetOps\Models\Driver {
-        public function updateRecordFromRequest(Request $request, $id, ?callable $onBefore = null, ?callable $onAfter = null, array $options = [])
-        {
-            throw new Fleetbase\Exceptions\FleetbaseRequestValidationException(['The status field is invalid.']);
-        }
-    };
-    $validationResponse = $validationFailure->updateRecord(fleetopsDriverAdoptionUpdateRequest('driver_missing1', ['name' => 'Validation Failure']), 'driver_missing1');
-    expect($validationResponse->getData(true)['error'])->toBe(['The status field is invalid.']);
-
-    // Any other failure reports its own message
-    $genericFailure        = new DriverController();
-    $genericFailure->model = new class extends Fleetbase\FleetOps\Models\Driver {
-        public function updateRecordFromRequest(Request $request, $id, ?callable $onBefore = null, ?callable $onAfter = null, array $options = [])
-        {
-            throw new Exception('Driver profile is locked.');
-        }
-    };
-    $genericResponse = $genericFailure->updateRecord(fleetopsDriverAdoptionUpdateRequest('driver_missing1', ['name' => 'Generic Failure']), 'driver_missing1');
-    expect($genericResponse->getData(true)['error'] ?? '')->toBe('Driver profile is locked.');
-});
-
-test('update rejects requests that fail validation before persistence', function () {
-    fleetopsDriverAdoptionBoot(['status' => ['The selected status is invalid.']]);
-
-    // The error-response seam raises the validation failure once the rejection
-    // branch executes, so the request never reaches persistence
-    $failure = null;
-
-    try {
-        (new DriverController())->updateRecord(fleetopsDriverAdoptionUpdateRequest('driver_missing1', ['status' => 'bogus']), 'driver_missing1');
-    } catch (Illuminate\Validation\ValidationException $exception) {
-        $failure = $exception;
-    }
-
-    expect($failure?->errors())->toBe(['status' => ['The selected status is invalid.']]);
-});