Merge pull request #123 from RonasIT/100_fix_test_generation_when_model_in_not_default_directory

fix: test generation when model in not default directory

Author: DenTray

src/Generators/AbstractTestsGenerator.php

@@ -90,9 +90,7 @@ protected function getInserts(): array
 
     protected function isFactoryExists(string $modelName): bool
     {
-        $modelClass = $this->getModelClass($modelName);
-
-        return $this->classExists('factories', "{$modelName}Factory") && method_exists($modelClass, 'factory');
+        return $this->classExists('factories', "{$modelName}Factory");
     }
 
     protected function isMethodExists($modelName, $method): bool
@@ -172,8 +170,8 @@ protected function getMockModel($model): array
             return [];
         }
 
-        $modelClass = $this->getModelClass($model);
-        $factory = $modelClass::factory();
+        $factoryNamespace = "{$this->getOrCreateNamespace('factories')}\\{$model}Factory";
+        $factory = $factoryNamespace::new();
 
         return $factory
             ->make()

src/Generators/FactoryGenerator.php

@@ -51,6 +51,7 @@ public function generate(): void
             'namespace' => $this->getOrCreateNamespace('factories'),
             'entity' => $this->model,
             'fields' => $this->prepareFields(),
+            'modelNamespace' => $this->getOrCreateNamespace('models'),
         ]);
 
         $this->saveClass('factories', "{$this->model}Factory", $factoryContent);

stubs/factory.blade.php

@@ -2,9 +2,12 @@
 
 use Faker\Generator as Faker;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use {{$modelNamespace}}\{{$entity}};
 
 class {{$entity}}Factory extends Factory
 {
+    protected $model = {{$entity}}::class;
+
     public function definition(): array
     {
 @if(!empty($fields))

stubs/model.blade.php

@@ -1,12 +1,11 @@
 namespace {{$namespace}};
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use RonasIT\Support\Traits\ModelTrait;
 
 class {{$entity}} extends Model
 {
-    use HasFactory, ModelTrait;
+    use ModelTrait;
 
     protected $fillable = [
 @foreach($fields as $field)

tests/fixtures/FactoryGeneratorTest/post_factory.php

@@ -4,9 +4,12 @@
 
 use Faker\Generator as Faker;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use App\Models\Post;
 
 class PostFactory extends Factory
 {
+    protected $model = Post::class;
+
     public function definition(): array
     {
         $faker = app(Faker::class);