test(model): dan sepertinya dari 2 opsi saya diharuskan untuk

milih opsi ke 3, F! revert 5e77247, fix #65 (hopefuly) 🤞 Signed-off-by: Fery Wardiyanto <[email protected]>
creasico · Oct 14, 2023 · 0e9c211 · 0e9c211
1 parent 5e77247
commit 0e9c211
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 13 deletions.
diff --git a/database/.gitattributes b/database/.gitattributes
diff --git a/database/migrations/.gitattributes b/database/migrations/.gitattributes
@@ -0,0 +1 @@
+*_testbench_*.php  export-ignore
diff --git a/src/Models/Address.php b/src/Models/Address.php
@@ -31,6 +31,11 @@ class Address extends NusaAddress
 
     protected $casts = [];
 
+    protected static function newFactory()
+    {
+        return Factories\AddressFactory::new();
+    }
+
     public function getCasts()
     {
         return \array_merge(parent::getCasts(), [

diff --git a/src/Models/Concerns/Factories/WithIdentity.php b/src/Models/Concerns/Factories/WithIdentity.php
@@ -3,7 +3,6 @@
 namespace Creasi\Base\Models\Concerns\Factories;
 
 use Creasi\Base\Models\Personnel;
-use Database\Factories\PersonnelFactory;
 
 /**
  * @mixin \Illuminate\Database\Eloquent\Factories\Factory
@@ -13,7 +12,7 @@ trait WithIdentity
     public function withIdentity(\Closure $cb = null): static
     {
         if ($cb === null) {
-            $cb = fn (PersonnelFactory $identity) => $identity->withProfile();
+            $cb = fn ($identity) => $identity->withProfile();
         }
 
         return $this->has($cb(Personnel::factory()), 'identity');

diff --git a/src/Models/Factories/.gitattributes b/src/Models/Factories/.gitattributes
@@ -0,0 +1 @@
+UserFactory.php  export-ignore
diff --git a/database/factories/AddressFactory.php → src/Models/Factories/AddressFactory.php b/database/factories/AddressFactory.php → src/Models/Factories/AddressFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\Address;
 use Creasi\Base\Models\Enums\AddressType;

diff --git a/database/factories/BusinessFactory.php → src/Models/Factories/BusinessFactory.php b/database/factories/BusinessFactory.php → src/Models/Factories/BusinessFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\Business;
 use Creasi\Base\Models\Concerns\Factories;

diff --git a/database/factories/FileUploadFactory.php → src/Models/Factories/FileUploadFactory.php b/database/factories/FileUploadFactory.php → src/Models/Factories/FileUploadFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\FileUpload;
 use Illuminate\Database\Eloquent\Factories\Factory;

diff --git a/database/factories/PersonnelFactory.php → src/Models/Factories/PersonnelFactory.php b/database/factories/PersonnelFactory.php → src/Models/Factories/PersonnelFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\Concerns\Factories;
 use Creasi\Base\Models\Enums\Gender;

diff --git a/database/factories/ProfileFactory.php → src/Models/Factories/ProfileFactory.php b/database/factories/ProfileFactory.php → src/Models/Factories/ProfileFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\Enums;
 use Creasi\Base\Models\Profile;

diff --git a/database/factories/UserFactory.php → src/Models/Factories/UserFactory.php b/database/factories/UserFactory.php → src/Models/Factories/UserFactory.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Database\Factories;
+namespace Creasi\Base\Models\Factories;
 
 use Creasi\Base\Models\Concerns\Factories\WithIdentity;
 use Illuminate\Database\Eloquent\Factories\Factory;

diff --git a/src/Models/Model.php b/src/Models/Model.php
@@ -16,4 +16,12 @@ abstract class Model extends EloquentModel
 {
     use HasFactory;
     use SoftDeletes;
+
+    protected static function newFactory()
+    {
+        $modelName = \class_basename(static::class);
+        $factory = __NAMESPACE__."\\Factories\\{$modelName}Factory";
+
+        return $factory::new();
+    }
 }
diff --git a/tests/Fixtures/User.php b/tests/Fixtures/User.php
@@ -4,6 +4,7 @@
 
 use Creasi\Base\Contracts\HasIdentity;
 use Creasi\Base\Models\Concerns\WithIdentity;
+use Creasi\Base\Models\Factories\UserFactory;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
@@ -27,6 +28,11 @@ class User extends Authenticatable implements HasIdentity
     use Notifiable;
     use WithIdentity;
 
+    protected static function newFactory()
+    {
+        return UserFactory::new();
+    }
+
     public function password(): Attribute
     {
         return Attribute::set(fn (string $value) => \bcrypt($value));

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -6,7 +6,6 @@
 use Creasi\Base\ServiceProvider;
 use Creasi\Nusa\ServiceProvider as NusaServiceProvider;
 use Creasi\Tests\Fixtures\User;
-use Database\Factories\PersonnelFactory;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\SanctumServiceProvider;
@@ -34,7 +33,7 @@ final protected function user(array|Closure $attrs = []): User
     {
         if (! $this->currentUser?->exists) {
             $this->currentUser = User::factory()
-                ->withIdentity(fn (PersonnelFactory $p) => $p->withProfile()->withCompany(true))
+                ->withIdentity(fn ($p) => $p->withProfile()->withCompany(true))
                 ->createOne($attrs);
         }