diff --git a/database/seeders/RolePermissionSeeder.php b/database/seeders/RolePermissionSeeder.php index 2f87207..272ef3e 100644 --- a/database/seeders/RolePermissionSeeder.php +++ b/database/seeders/RolePermissionSeeder.php @@ -4,7 +4,6 @@ namespace Database\Seeders; use App\Models\User; use Illuminate\Database\Seeder; -use Illuminate\Support\Facades\Hash; use Spatie\Permission\Models\Permission; use Spatie\Permission\Models\Role; use Spatie\Permission\PermissionRegistrar; @@ -78,25 +77,7 @@ class RolePermissionSeeder extends Seeder $role->syncPermissions($perms); } - // 4. Buat Akun Default Super Admin (Murni dibaca dari config/auth.php & .env) - $superAdminConfig = config('auth.superadmin'); - if ($superAdminConfig && !empty($superAdminConfig['username']) && !empty($superAdminConfig['password'])) { - $superAdmin = User::firstOrCreate( - ['username' => $superAdminConfig['username']], - [ - 'name' => $superAdminConfig['name'] ?? 'Super Administrator', - 'email' => $superAdminConfig['email'] ?? 'superadmin@kmh.co.id', - 'password' => Hash::make($superAdminConfig['password']), - 'role' => 'super_admin', - ] - ); - - if (!$superAdmin->hasRole('super_admin')) { - $superAdmin->assignRole('super_admin'); - } - } - - // 5. Sinkronisasi Akun Existing ke Spatie Roles + // 4. Sinkronisasi Akun Existing ke Spatie Roles (jika sebelumnya sudah ada akun di DB) $existingUsers = User::all(); foreach ($existingUsers as $user) { if ($user->role && in_array($user->role, array_keys($rolesWithPermissions))) { diff --git a/tests/Feature/AuthenticationTest.php b/tests/Feature/AuthenticationTest.php index a50b0d3..455121c 100644 --- a/tests/Feature/AuthenticationTest.php +++ b/tests/Feature/AuthenticationTest.php @@ -45,7 +45,7 @@ class AuthenticationTest extends TestCase $user = auth()->user(); $this->assertEquals('1185', $user->username); - $this->assertEquals('Mima', $user->name); + $this->assertEquals(config('auth.hse_admin.name', 'Mima'), $user->name); $this->assertEquals('hse_admin', $user->role); } @@ -64,7 +64,7 @@ class AuthenticationTest extends TestCase $user = auth()->user(); $this->assertEquals('1171', $user->username); - $this->assertEquals('Pinto Yuliandra', $user->name); + $this->assertEquals(config('auth.qma_admin.name', 'Pinto Yuliandra'), $user->name); $this->assertEquals('qma_admin', $user->role); } diff --git a/tests/TestCase.php b/tests/TestCase.php index 2c9574a..51015c7 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -22,6 +22,20 @@ abstract class TestCase extends BaseTestCase if (Schema::hasTable('permissions') && \Spatie\Permission\Models\Permission::count() === 0) { $this->seed(RolePermissionSeeder::class); } + + if (Schema::hasTable('users') && User::where('username', 'superadmin')->count() === 0) { + $superAdmin = User::firstOrCreate([ + 'username' => config('auth.superadmin.username', 'superadmin'), + ], [ + 'name' => config('auth.superadmin.name', 'Super Administrator'), + 'email' => config('auth.superadmin.email', 'superadmin@kmh.co.id'), + 'password' => Hash::make(config('auth.superadmin.password', 'password')), + 'role' => 'super_admin', + ]); + if (!$superAdmin->hasRole('super_admin')) { + $superAdmin->assignRole('super_admin'); + } + } } /**