* Add boolean field "disable activity checks" to role, check for this field inside PilotLeave-Check, add tests * fix checkbox on form * CS fixes * CS fixes again :-) Co-authored-by: Andreas Palm <ap@ewsp.de>
This commit is contained in:
@@ -6,6 +6,7 @@ use App\Models\Aircraft;
|
||||
use App\Models\Enums\UserState;
|
||||
use App\Models\Flight;
|
||||
use App\Models\Pirep;
|
||||
use App\Models\Role;
|
||||
use App\Models\Subfleet;
|
||||
use App\Models\User;
|
||||
use Exception;
|
||||
@@ -154,4 +155,16 @@ trait TestData
|
||||
'aircraft' => $aircraft,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a role
|
||||
*
|
||||
* @param array $attrs Additional role attributes
|
||||
*
|
||||
* @return Role
|
||||
*/
|
||||
public function createRole(array $attrs = []): Role
|
||||
{
|
||||
return factory(Role::class)->create($attrs);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -370,5 +370,19 @@ class UserTest extends TestCase
|
||||
|
||||
$users_on_leave = $this->userSvc->findUsersOnLeave();
|
||||
$this->assertEquals(0, count($users_on_leave));
|
||||
|
||||
// Check disable_activity_checks
|
||||
$user = $this->createUser([
|
||||
'status' => UserState::ACTIVE,
|
||||
'created_at' => Carbon::now('UTC')->subDays(5),
|
||||
]);
|
||||
$role = $this->createRole([
|
||||
'disable_activity_checks' => true,
|
||||
]);
|
||||
$user->attachRole($role);
|
||||
$user->save();
|
||||
|
||||
$users_on_leave = $this->userSvc->findUsersOnLeave();
|
||||
$this->assertEquals(0, count($users_on_leave));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user