Move group creation to seeder

nanaya · Nov 6, 2023 · c6c2271 · c6c2271
1 parent b0b0ce7
commit c6c2271
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
@@ -18,6 +18,8 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         try {
+            $this->call(ModelSeeders\GroupSeeder::class);
+
             // Miscellaneous Data (e.g. counts)
             $this->call(ModelSeeders\MiscSeeder::class);
 

diff --git a/database/seeders/ModelSeeders/GroupSeeder.php b/database/seeders/ModelSeeders/GroupSeeder.php
@@ -0,0 +1,28 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace Database\Seeders\ModelSeeders;
+
+use App\Models\Group;
+use Illuminate\Database\Seeder;
+
+class GroupSeeder extends Seeder
+{
+    public function run(): void
+    {
+        Group::truncate();
+        foreach (Group::PRIV_IDENTIFIERS as $identifier) {
+            Group::create([
+                'group_desc' => '',
+                'group_name' => $identifier,
+                'group_type' => 2,
+                'identifier' => $identifier,
+                'short_name' => $identifier,
+            ]);
+        }
+    }
+}
diff --git a/tests/SeederExtension.php b/tests/SeederExtension.php
@@ -8,6 +8,7 @@
 namespace Tests;
 
 use App\Models\Group;
+use Database\Seeders\ModelSeeders\GroupSeeder;
 use PHPUnit\Runner\AfterLastTestHook;
 use PHPUnit\Runner\BeforeFirstTestHook;
 
@@ -23,16 +24,7 @@ public function executeAfterLastTest(): void
     public function executeBeforeFirstTest(): void
     {
         TestCase::withDbAccess(function () {
-            Group::truncate();
-            foreach (Group::PRIV_IDENTIFIERS as $identifier) {
-                Group::create([
-                    'group_desc' => '',
-                    'group_name' => $identifier,
-                    'group_type' => 2,
-                    'identifier' => $identifier,
-                    'short_name' => $identifier,
-                ]);
-            }
+            (new GroupSeeder())->run();
         });
     }
 }