diff --git a/tests/Fixture/Models/Permission.php b/tests/Fixture/Models/Permission.php index 9474d2d..6082df3 100644 --- a/tests/Fixture/Models/Permission.php +++ b/tests/Fixture/Models/Permission.php @@ -4,4 +4,4 @@ namespace Lloricode\FilamentSpatieLaravelPermissionPlugin\Tests\Fixture\Models; -class Permission extends \Lloricode\FilamentSpatieLaravelPermissionPlugin\Models\Permission {} +class Permission extends \Spatie\Permission\Models\Permission {} diff --git a/tests/Fixture/Models/Role.php b/tests/Fixture/Models/Role.php index 0830ec1..26d81cf 100644 --- a/tests/Fixture/Models/Role.php +++ b/tests/Fixture/Models/Role.php @@ -4,4 +4,4 @@ namespace Lloricode\FilamentSpatieLaravelPermissionPlugin\Tests\Fixture\Models; -class Role extends \Lloricode\FilamentSpatieLaravelPermissionPlugin\Models\Role {} +class Role extends \Spatie\Permission\Models\Role {} diff --git a/tests/Helpers.php b/tests/Helpers.php index e0ef49c..5f43093 100644 --- a/tests/Helpers.php +++ b/tests/Helpers.php @@ -3,7 +3,6 @@ declare(strict_types=1); use Illuminate\Database\Eloquent\Model; -use Lloricode\FilamentSpatieLaravelPermissionPlugin\Models\Role; use Lloricode\FilamentSpatieLaravelPermissionPlugin\Tests\Fixture\UserFactory; use Spatie\Permission\Contracts\Role as RoleContract; @@ -12,12 +11,23 @@ function loginAsSuperAdmin() { $user = UserFactory::new()->createOne(['email' => 'test@test.com']); - $user->assignRole(Role::superAdmin()); + $user->assignRole(getSuperAdminRole()); actingAs($user); return $user; } +// get user admin role +function getSuperAdminRole(): RoleContract & Model +{ + /** @var RoleContract&Model $role */ + $role = app(RoleContract::class)->findByName( + name: config('filament-permission.roles.super_admin'), + ); + + return $role; +} + function createRole(string $name, ?string $guard = null): RoleContract & Model { /** @var RoleContract&Model $role */