fix:

- minor fixes
- removed unused methods
- use WelcomeBonusResource instead mocking NovaTestGenerator

Author: aizlee

composer.json

@@ -38,7 +38,8 @@
     "psr-4": {
       "RonasIT\\Support\\Tests\\": "tests/",
       "RonasIT\\Support\\Tests\\Support\\": "tests/Support/",
-      "App\\Models\\": "tests/Support/Models/"
+      "App\\Models\\": "tests/Support/Models/",
+      "App\\Nova\\": "tests/Support/Nova/"
     },
     "files": [
       "tests/TestCase.php"

src/Generators/AbstractTestsGenerator.php

@@ -184,6 +184,7 @@ protected function getMockModel($model): array
         $hasFactory = method_exists($modelClass, 'factory') && $this->classExists('factory', "{$model}Factory");
         $factory = ($hasFactory) ? $modelClass::factory() : factory($modelClass);
 
+        dd($factory);
         return $factory
             ->make()
             ->toArray();

src/Generators/NovaResourceGenerator.php

@@ -112,7 +112,7 @@ protected function prepareNovaFields(): array
         return $result;
     }
 
-    public function getFieldsForCreation(): array
+    protected function getFieldsForCreation(): array
     {
         if ($this->commandFieldsExists()) {
             return $this->getFieldsFromCommandLineArguments();

tests/NovaResourceGeneratorTest.php

@@ -2,17 +2,11 @@
 
 namespace RonasIT\Support\Tests;
 
-use Doctrine\DBAL\Schema\Column;
-use Doctrine\DBAL\Types\DateTimeType;
-use Doctrine\DBAL\Types\IntegerType;
-use Doctrine\DBAL\Types\StringType;
 use Illuminate\Support\Facades\Event;
-use ReflectionClass;
 use RonasIT\Support\Events\SuccessCreateMessage;
 use RonasIT\Support\Exceptions\ClassAlreadyExistsException;
 use RonasIT\Support\Exceptions\ClassNotExistsException;
 use RonasIT\Support\Generators\NovaResourceGenerator;
-use RonasIT\Support\Support\DatabaseNovaField;
 use RonasIT\Support\Tests\Support\NovaResourceGeneratorTest\NovaResourceGeneratorMockTrait;
 
 class NovaResourceGeneratorTest extends TestCase
@@ -44,9 +38,11 @@ public function testCreateNovaResourceWithMissingModel()
     {
         $this->mockNovaServiceProviderExists();
 
-        $this->expectException(ClassNotExistsException::class);
-        $this->expectExceptionMessage('Cannot create Post Nova resource cause Post Model does not exists. '
-            . "Create a Post Model by himself or run command 'php artisan make:entity Post --only-model'");
+        $this->assertExceptionThrowed(
+            className: ClassNotExistsException::class,
+            message: 'Cannot create Post Nova resource cause Post Model does not exists. '
+            . "Create a Post Model by himself or run command 'php artisan make:entity Post --only-model'"
+        );
 
         app(NovaResourceGenerator::class)
             ->setModel('Post')

tests/NovaTestGeneratorTest.php

@@ -13,7 +13,7 @@ class NovaTestGeneratorTest extends TestCase
 {
     use NovaTestGeneratorMockTrait;
 
-    public function testCreateNovaTestsResourceNotExists()
+    public function testGenerateResourceNotExists()
     {
         $this->mockNovaServiceProviderExists();
 
@@ -33,7 +33,7 @@ className: ClassNotExistsException::class,
             ->generate();
     }
 
-    public function testCreateNovaTestAlreadyExists()
+    public function testGenerateNovaTestAlreadyExists()
     {
         $this->mockNovaServiceProviderExists();
 
@@ -70,7 +70,7 @@ public function testSuccess()
         $this->assertGeneratedFileEquals('update_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusTest/update_welcome_bonus_request.json');
     }
 
-    public function testCreateWithMissingNovaPackage()
+    public function testGenerateNovaPackageNotInstall()
     {
         Event::fake();
 

tests/Support/FileSystemMock.php

@@ -5,18 +5,19 @@
 use Illuminate\Support\Arr;
 use org\bovigo\vfs\vfsStream;
 
-class FileSystemMock {
-    public $novaModels = null;
-    public $novaActions = null;
-    public $models = null;
-    public $controllers = null;
-    public $services = null;
-    public $repositories = null;
-    public $testFixtures = null;
-    public $testClasses = null;
-    public $routes = null;
-
-    public function setStructure()
+class FileSystemMock
+{
+    public ?array $novaModels = null;
+    public ?array $novaActions = null;
+    public ?array $models = null;
+    public ?array $controllers = null;
+    public ?array $services = null;
+    public ?array $repositories = null;
+    public ?array $testFixtures = null;
+    public ?array $testClasses = null;
+    public ?array $routes = null;
+
+    public function setStructure(): void
     {
         $structure = ['app' => []];
 

tests/Support/GeneratorMockTrait.php

@@ -17,11 +17,6 @@ public function mockClassExistsFunction(string $className, bool $result = true,
         ]);
     }
 
-    public function mockCheckingNovaPackageExistence(string $className, bool $result = false): void
-    {
-        $this->mockClassExistsFunction($className, $result);
-    }
-
     public function mockNovaServiceProviderExists(bool $result = true): void
     {
         $this->mockClassExistsFunction(NovaServiceProvider::class, $result);

tests/Support/Nova/WelcomeBonusResource.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Nova;
+
+use Laravel\Nova\Fields\ID;
+use Laravel\Nova\Fields\Text;
+use Laravel\Nova\Http\Requests\NovaRequest;
+use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\CreatedAtFilter;
+use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\DateField;
+use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\PublishPostAction;
+use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\TextField;
+use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\UnPublishPostAction;
+
+class WelcomeBonusResource
+{
+    public static $title = 'name';
+
+    public static $search = ['id', 'name'];
+
+    public static function label(): string
+    {
+        return 'WelcomeBonus';
+    }
+
+    public function fields(NovaRequest $request): array
+    {
+        return [
+            new TextField,
+            new DateField,
+        ];
+    }
+
+    public function cards(NovaRequest $request): array
+    {
+        return [];
+    }
+
+    public function filters(NovaRequest $request): array
+    {
+        return [
+            new CreatedAtFilter,
+        ];
+    }
+
+    public function lenses(NovaRequest $request): array
+    {
+        return [];
+    }
+
+    public function actions(NovaRequest $request): array
+    {
+        return [
+            new PublishPostAction,
+            new UnPublishPostAction,
+            new UnPublishPostAction,
+        ];
+    }
+}

tests/Support/NovaTestGeneratorTest/NovaTestGeneratorMockTrait.php

@@ -2,7 +2,7 @@
 
 namespace RonasIT\Support\Tests\Support\NovaTestGeneratorTest;
 
-use RonasIT\Support\Generators\NovaTestGenerator;
+use Mockery;
 use RonasIT\Support\Tests\Support\FileSystemMock;
 use RonasIT\Support\Tests\Support\GeneratorMockTrait;
 use RonasIT\Support\Traits\MockTrait;
@@ -14,42 +14,9 @@ trait NovaTestGeneratorMockTrait
 
     public function mockNovaResourceTestGenerator(): void
     {
-        $this->mockClass(NovaTestGenerator::class, [
-            [
-                'function' => 'getMockModel',
-                'arguments' => ['WelcomeBonus'],
-                'result' => ['title' => 'some title', 'name' => 'some name']
-            ],
-            [
-                'function' => 'getMockModel',
-                'arguments' => ['WelcomeBonus'],
-                'result' => ['title' => 'some title', 'name' => 'some name']
-            ],
-            [
-                'function' => 'loadNovaActions',
-                'arguments' => [],
-                'result' => [
-                    new PublishPostAction,
-                    new UnPublishPostAction,
-                    new UnPublishPostAction,
-                ]
-            ],
-            [
-                'function' => 'loadNovaFields',
-                'arguments' => [],
-                'result' => [
-                    new TextField,
-                    new DateField,
-                ]
-            ],
-            [
-                'function' => 'loadNovaFilters',
-                'arguments' => [],
-                'result' => [
-                    new CreatedAtFilter,
-                ]
-            ],
-        ]);
+        $mock = Mockery::mock('alias:Laravel\Nova\Http\Requests\NovaRequest');
+
+        $this->app->instance('Laravel\Nova\Http\Requests\NovaRequest', $mock);
     }
 
     public function mockFilesystem(): void
@@ -64,7 +31,7 @@ public function mockFilesystem(): void
         ];
 
         $fileSystemMock->novaModels = [
-            'WelcomeBonus.php' => $this->mockPhpFileContent(),
+            'WelcomeBonusResource.php' => $this->mockPhpFileContent(),
         ];
 
         $fileSystemMock->models = [

tests/fixtures/NovaTestGeneratorTest/create_welcome_bonus_request.json

@@ -1,4 +1,4 @@
 {
-    "title": "some title",
-    "name": "some name"
+    "title": 1,
+    "name": 1
 }