Merge remote-tracking branch 'origin/master' into 49-add-service-generator-tests

# Conflicts:
#	tests/SeederGeneratorTest.php

Author: pirs1337

composer.lock

@@ -26,7 +26,7 @@ abstract class EntityGenerator
     protected $paths = [];
     protected $model;
     protected $fields;
-    protected $relations;
+    protected $relations = [];
     protected $crudOptions;
 
     /**

src/Generators/EntityGenerator.php

@@ -25,7 +25,7 @@ public function generate(): void
             );
         }
 
-        if ($this->isStubExists('model') && (collect($this->relations)->every(fn ($relation) => empty($relation)) || $this->isStubExists('relation', 'model'))) {
+        if ($this->isStubExists('model') && (!$this->hasRelations() || $this->isStubExists('relation', 'model'))) {
             $this->prepareRelatedModels();
             $modelContent = $this->getNewModelContent();
 
@@ -35,6 +35,11 @@ public function generate(): void
         }
     }
 
+    protected function hasRelations(): bool
+    {
+        return !collect($this->relations)->every(fn ($relation) => empty($relation));
+    }
+
     protected function getNewModelContent(): string
     {
         return $this->getStub('model', [

src/Generators/ModelGenerator.php

@@ -12,7 +12,7 @@ public function generate(): void
         if (!$this->classExists('models', $this->model)) {
             $this->throwFailureException(
                 ClassNotExistsException::class,
-                "Cannot create {$this->model} Model cause {$this->model} Model does not exists.",
+                "Cannot create {$this->model}Repository cause {$this->model} Model does not exists.",
                 "Create a {$this->model} Model by himself or run command 'php artisan make:entity {$this->model} --only-model'."
             );
         }

src/Generators/RepositoryGenerator.php

@@ -50,7 +50,6 @@ className: ClassAlreadyExistsException::class,
 
     public function testProcessUnknownFieldType()
     {
-        $this->mockConfigurations();
         $this->mockFilesystem();
 
         $this->assertExceptionThrew(
@@ -74,7 +73,6 @@ className: ViewException::class,
 
     public function testCreateSuccess()
     {
-        $this->mockConfigurations();
         $this->mockFilesystem();
 
         app(FactoryGenerator::class)

tests/FactoryGeneratorTest.php

@@ -5,16 +5,11 @@
 use Illuminate\Support\Carbon;
 use RonasIT\Support\Exceptions\UnknownFieldTypeException;
 use RonasIT\Support\Generators\MigrationGenerator;
-use RonasIT\Support\Tests\Support\Migration\MigrationMockTrait;
 
 class MigrationGeneratorTest extends TestCase
 {
-    use MigrationMockTrait;
-
     public function testSetUnknownFieldType()
     {
-        $this->setupConfigurations();
-
         $this->assertExceptionThrew(
             className: UnknownFieldTypeException::class,
             message: 'Unknown field type unknown-type in MigrationGenerator.',
@@ -39,9 +34,6 @@ public function testCreateMigration()
     {
         Carbon::setTestNow('2022-02-02');
 
-        $this->mockFilesystem();
-        $this->setupConfigurations();
-
         app(MigrationGenerator::class)
             ->setModel('Post')
             ->setRelations([
@@ -67,9 +59,6 @@ public function testCreateMigrationMYSQL()
 
         Carbon::setTestNow('2022-02-02');
 
-        $this->mockFilesystem();
-        $this->setupConfigurations();
-
         app(MigrationGenerator::class)
             ->setModel('Post')
             ->setRelations([

tests/MigrationGeneratorTest.php

@@ -8,11 +8,10 @@
 use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Generators\ModelGenerator;
 use RonasIT\Support\Tests\Support\Model\ModelMockTrait;
-use RonasIT\Support\Traits\MockTrait;
 
 class ModelGeneratorTest extends TestCase
 {
-    use ModelMockTrait, MockTrait;
+    use ModelMockTrait;
 
     public function testModelAlreadyExists()
     {
@@ -69,7 +68,7 @@ public function testCreateModel()
 
         $this->assertGeneratedFileEquals('new_model.php', 'app/Models/Post.php');
         $this->assertGeneratedFileEquals('comment_relation_model.php', 'app/Models/Comment.php');
-        $this->assertGeneratedFileEquals('user_relation_model.php', 'app/Models/User.php');
+        $this->assertGeneratedFileEquals('comment_relation_model.php', 'app/Models/User.php');
 
         $this->assertEventPushed(
             className: SuccessCreateMessage::class,
@@ -86,12 +85,6 @@ public function testCreateModelStubNotExist()
         app(ModelGenerator::class)
             ->setModel('Post')
             ->setFields([])
-            ->setRelations([
-                'hasOne' => [],
-                'hasMany' => [],
-                'belongsTo' => [],
-                'belongsToMany' => [],
-            ])
             ->generate();
 
         $this->assertFileDoesNotExist('app/Models/Post.php');
@@ -113,12 +106,6 @@ public function testCreateModelWithoutRelationsRelationStubNotExist()
         app(ModelGenerator::class)
             ->setModel('Post')
             ->setFields([])
-            ->setRelations([
-                'hasOne' => [],
-                'hasMany' => [],
-                'belongsTo' => [],
-                'belongsToMany' => [],
-            ])
             ->generate();
 
         $this->assertGeneratedFileEquals('new_model_without_fields_and_relations.php', 'app/Models/Post.php');

tests/ModelGeneratorTest.php

@@ -2,7 +2,6 @@
 
 namespace RonasIT\Support\Tests;
 
-use Illuminate\Support\Facades\Event;
 use RonasIT\Support\Events\SuccessCreateMessage;
 use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Exceptions\ClassAlreadyExistsException;
@@ -14,13 +13,6 @@ class NovaResourceGeneratorTest extends TestCase
 {
     use NovaResourceGeneratorMockTrait;
 
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        Event::fake();
-    }
-
     public function testCreateWithMissingNovaPackage()
     {
         $this->mockNovaServiceProviderExists(false);

tests/NovaResourceGeneratorTest.php

@@ -3,7 +3,6 @@
 namespace RonasIT\Support\Tests;
 
 use RonasIT\Support\Tests\Support\Models\WelcomeBonus;
-use Illuminate\Support\Facades\Event;
 use RonasIT\Support\Events\SuccessCreateMessage;
 use RonasIT\Support\Events\WarningEvent;
 use RonasIT\Support\Exceptions\ClassAlreadyExistsException;
@@ -58,8 +57,6 @@ className: ClassAlreadyExistsException::class,
 
     public function testNovaTestStubNotExist()
     {
-        Event::fake();
-
         $this->mockNativeGeneratorFunctions(
             $this->nativeClassExistsMethodCall([NovaServiceProvider::class, true]),
             $this->nativeClassExistsMethodCall([WelcomeBonus::class, true]),
@@ -96,8 +93,6 @@ className: WarningEvent::class,
 
     public function testDumpStubNotExist()
     {
-        Event::fake();
-
         $this->mockNovaServiceProviderExists();
 
         $this->mockFilesystem();
@@ -156,8 +151,6 @@ public function testSuccess()
 
     public function testGenerateNovaPackageNotInstall()
     {
-        Event::fake();
-
         $this->mockNovaServiceProviderExists(false);
 
         app(NovaTestGenerator::class)

tests/NovaTestGeneratorTest.php

@@ -20,7 +20,7 @@ public function testModelNotExist()
 
         $this->assertExceptionThrew(
             className: ClassNotExistsException::class,
-            message: "Cannot create Post Model cause Post Model does not exists. "
+            message: "Cannot create PostRepository cause Post Model does not exists. "
             . "Create a Post Model by himself or run command 'php artisan make:entity Post --only-model'.",
         );