refactor: correct set resource instead model

Author: RGO230

.env.testing

@@ -0,0 +1 @@
+FAIL_EXPORT_JSON=false

src/Generators/NovaTestGenerator.php

@@ -33,38 +33,53 @@ public function __construct()
     public function generate(): void
     {
         if (class_exists(NovaServiceProvider::class)) {
-            if (!$this->classExists('models', $this->model)) {
+            if (!$this->classExists('models', $this->model, $this->modelSubFolder)) {
                 $this->throwFailureException(
                     ClassNotExistsException::class,
                     "Cannot create Nova{$this->model}Resource Test cause {$this->model} does not exist.",
                     "Create a {$this->model} Model by himself or run command 'php artisan make:entity {$this->model} --only-model'."
                 );
             }
 
-            $novaResources = $this->getCommonNovaResources();
+            if (empty($this->novaResourceName)) {
 
-            if (count($novaResources) > 1){
-                $foundedResources = implode(', ', $novaResources);
+                $novaResources = $this->getCommonNovaResources();
 
-                // TODO: pass $this->modelSubfolder to Exception after refactoring in https://github.com/RonasIT/laravel-entity-generator/issues/179
-                $this->throwFailureException(
-                    EntityCreateException::class,
-                    "Cannot create Nova{$this->model}ResourceTest cause was found a lot of suitable resources: {$foundedResources}.",
-                    'Make test by yourself.'
-                );
+                if (count($novaResources) > 1) {
+                    $foundedResources = implode(', ', $novaResources);
+
+                    // TODO: pass $this->modelSubfolder to Exception after refactoring in https://github.com/RonasIT/laravel-entity-generator/issues/179
+                    $this->throwFailureException(
+                        EntityCreateException::class,
+                        "Cannot create Nova{$this->model}ResourceTest cause was found a lot of suitable resources: {$foundedResources}.",
+                        'Please, use --resource-name option.'
+                    );
+                }
+
+                if (empty($novaResources)) {
+                    $this->throwFailureException(
+                        ClassNotExistsException::class,
+                        "Cannot create Nova{$this->model}ResourceTest cause {$this->model} Nova resource does not exist.",
+                        "Create {$this->model} Nova resource."
+                    );
+                }
+
+                $this->novaResourceName = array_pop($novaResources);
             }
 
-            if (empty($novaResources)) {
+            $this->shortNovaResourceName = Str::afterLast($this->novaResourceName, '\\');
+
+            $this->fullNovaResourcePath = "App\\Nova\\{$this->novaResourceName}";
+
+            if (!class_exists($this->fullNovaResourcePath)) {
                 $this->throwFailureException(
                     ClassNotExistsException::class,
-                    "Cannot create Nova{$this->model}ResourceTest cause {$this->model} Nova resource does not exist.",
-                    "Create {$this->model} Nova resource."
+                    "Cannot create Nova{$this->shortNovaResourceName}Test cause {$this->novaResourceName} Nova resource does not exist.",
+                    "Create {$this->novaResourceName} Nova resource."
                 );
             }
 
-            $this->novaResourceName = array_pop($novaResources);
-
-            if ($this->classExists('nova', "Nova{$this->model}Test")) {
+            if ($this->classExists('nova', "Nova{$this->shortNovaResourceName}Test")) {
                 $this->throwFailureException(
                     ClassAlreadyExistsException::class,
                     "Cannot create Nova{$this->model}ResourceTest cause it's already exist.",
@@ -94,25 +109,23 @@ public function generateTests(): void
         $actions = $this->getActions();
         $filters = $this->collectFilters();
 
-        $resourceClass = Str::afterLast($this->novaResourceName, '\\');
-
         $fileContent = $this->getStub('nova_test', [
             'url_path' => Str::kebab($this->model) . '-resources',
             'entity_namespace' => $this->getOrCreateNamespace('models', $this->modelSubFolder),
             'entity' => $this->model,
-            'resource' => $resourceClass,
+            'resource' => $this->shortNovaResourceName,
             'resource_path' => "App\\Nova\\{$this->novaResourceName}",
             'entities' => $this->getPluralName($this->model),
-            'snake_resource' => Str::snake($resourceClass),
+            'snake_resource' => Str::snake($this->shortNovaResourceName),
             'dromedary_entity' => Str::lcfirst($this->model),
             'lower_entities' => $this->getPluralName(Str::snake($this->model)),
             'actions' => $actions,
             'filters' => $filters,
         ]);
 
-        $this->saveClass('tests', "Nova{$resourceClass}Test", $fileContent);
+        $this->saveClass('tests', "Nova{$this->shortNovaResourceName}Test", $fileContent);
 
-        event(new SuccessCreateMessage("Created a new Nova test: Nova{$resourceClass}Test"));
+        event(new SuccessCreateMessage("Created a new Nova test: Nova{$this->shortNovaResourceName}Test"));
     }
 
     protected function getActions(): array
@@ -198,23 +211,6 @@ protected function isFixtureNeeded($type): bool
         return true;
     }
 
-    protected function getNovaResource(): string
-    {
-        $commonResources = $this->getCommonNovaResources();
-
-        if (count($commonResources) > 1) {
-            $commonResources = implode(', ', $commonResources);
-
-            $this->throwFailureException(
-                EntityCreateException::class,
-                "Cannot create Nova{$this->model}Resource Test cause was found a lot of suitable resources: $commonResources",
-                "Please, use --resource-name option"
-            );
-        }
-
-        return array_pop($commonResources);
-    }
-
     protected function collectFilters(): array
     {
         $filtersFromFields = $this->getFiltersFromFields();
@@ -250,7 +246,7 @@ protected function getFiltersFromFields(): array
 
     protected function getFilters(): array
     {
-        $filters = [];
+        $filters= [];
         $novaResourceFilters = $this->loadNovaFilters();
 
         foreach ($novaResourceFilters as $filter) {

tests/CommandTest.php

@@ -92,10 +92,10 @@ public function testCallCommand()
         $this->assertGeneratedFileEquals('validation.php', 'lang/en/validation.php');
         $this->assertGeneratedFileEquals('nova_resource.php', 'app/Nova/PostResource.php');
         $this->assertGeneratedFileEquals('nova_test.php', 'tests/NovaPostResourceTest.php');
-        $this->assertGeneratedFileEquals('nova_dump.php', 'tests/fixtures/NovaPostTest/nova_post_dump.sql');
-        $this->assertGeneratedFileEquals('create_request.json', 'tests/fixtures/NovaPostTest/create_post_request.json');
-        $this->assertGeneratedFileEquals('create_response.json', 'tests/fixtures/NovaPostTest/create_post_response.json');
-        $this->assertGeneratedFileEquals('update_request.json', 'tests/fixtures/NovaPostTest/update_post_request.json');
+        $this->assertGeneratedFileEquals('nova_dump.php', 'tests/fixtures/NovaPostResourceTest/nova_post_dump.sql');
+        $this->assertGeneratedFileEquals('create_request.json', 'tests/fixtures/NovaPostResourceTest/create_post_request.json');
+        $this->assertGeneratedFileEquals('create_response.json', 'tests/fixtures/NovaPostResourceTest/create_post_response.json');
+        $this->assertGeneratedFileEquals('update_request.json', 'tests/fixtures/NovaPostResourceTest/update_post_request.json');
     }
 
     public function testCallCommandSubFoldersModel()
@@ -138,10 +138,10 @@ public function testCallCommandSubFoldersModel()
         $this->assertGeneratedFileEquals('create_response.json', 'tests/fixtures/PostTest/create_post_response.json');
         $this->assertGeneratedFileEquals('update_request.json', 'tests/fixtures/PostTest/update_post_request.json');
         $this->assertGeneratedFileEquals('validation.php', 'lang/en/validation.php');
-        $this->assertGeneratedFileEquals('nova_dump.php', 'tests/fixtures/NovaPostTest/nova_post_dump.sql');
-        $this->assertGeneratedFileEquals('create_request.json', 'tests/fixtures/NovaPostTest/create_post_request.json');
-        $this->assertGeneratedFileEquals('create_response.json', 'tests/fixtures/NovaPostTest/create_post_response.json');
-        $this->assertGeneratedFileEquals('update_request.json', 'tests/fixtures/NovaPostTest/update_post_request.json');
+        $this->assertGeneratedFileEquals('nova_dump.php', 'tests/fixtures/NovaPostResourceTest/nova_post_dump.sql');
+        $this->assertGeneratedFileEquals('create_request.json', 'tests/fixtures/NovaPostResourceTest/create_post_request.json');
+        $this->assertGeneratedFileEquals('create_response.json', 'tests/fixtures/NovaPostResourceTest/create_post_response.json');
+        $this->assertGeneratedFileEquals('update_request.json', 'tests/fixtures/NovaPostResourceTest/update_post_request.json');
     }
 
     public function testMakeOnly()

tests/NovaTestGeneratorTest.php

@@ -10,10 +10,8 @@
 use RonasIT\Support\Generators\NovaTestGenerator;
 use RonasIT\Support\Tests\Support\NovaTestGeneratorTest\NovaTestGeneratorMockTrait;
 use Laravel\Nova\NovaServiceProvider;
-use RonasIT\Support\Tests\Support\Models\WelcomeBonus;
 use RonasIT\Support\Exceptions\EntityCreateException;
 use RonasIT\Support\Tests\Support\Models\Post;
-use RonasIT\Support\Exceptions\EntityCreateException;
 
 class NovaTestGeneratorTest extends TestCase
 {
@@ -44,41 +42,16 @@ className: ClassNotExistsException::class,
             ->generate();
     }
 
-    public function testGenerateToManyResources(): void
-    {
-        $this->mockNovaServiceProviderExists();
-
-        $this->mockClass(NovaTestGenerator::class, [
-            $this->getCommonNovaResourcesMock([
-                'BasePostResource',
-                'PublishPostResource',
-            ]),
-        ]);
-
-        $this->assertExceptionThrew(
-            className: EntityCreateException::class,
-            message: 'Cannot create NovaNewsResourceTest cause NewsResource Nova resource does not exist. Create NewsResource Nova resource.',
-        );
-
-        app(NovaTestGenerator::class)
-            ->setModel('News')
-            ->setMetaData(['resource_name' => 'NewsResource'])
-            ->generate();
-    }
-
     public function testGenerateNovaTestAlreadyExists()
     {
-        $this->mockNovaServiceProviderExists();
-
         $this->mockClass(NovaTestGenerator::class, [
-            $this->classExistsMethodCall(['nova', 'NovaPostTest']),
             $this->classExistsMethodCall(['models', 'Post']),
             $this->classExistsMethodCall(['nova', 'NovaPostResourceTest']),
         ]);
 
         $this->mockNativeGeneratorFunctions(
-            $this->nativeClassExistsMethodCall([NovaServiceProvider::class, true]),
-            $this->nativeClassExistsMethodCall(["App\Nova\Resources\PostResource"]),
+            $this->nativeClassExistsMethodCall([NovaServiceProvider::class]),
+            $this->nativeClassExistsMethodCall(["App\Nova\PostResource"]),
         );
 
         $this->assertExceptionThrew(
@@ -88,7 +61,7 @@ className: ClassAlreadyExistsException::class,
 
         app(NovaTestGenerator::class)
             ->setModel('Post')
-            ->setMetaData(['resource_name' => 'Resources\PostResource'])
+            ->setMetaData(['resource_name' => 'PostResource'])
             ->generate();
     }
 
@@ -165,11 +138,11 @@ public function testDumpStubNotExist()
             ->setMetaData(['resource_name' => 'WelcomeBonusResource'])
             ->generate();
 
-        $this->assertGeneratedFileEquals('created_resource_test.php', 'tests/NovaWelcomeBonusResourceTest.php');
+        $this->assertGeneratedFileEquals('created_welcome_bonus_resource_test.php', 'tests/NovaWelcomeBonusResourceTest.php');
         $this->assertFileDoesNotExist('tests/fixtures/NovaWelcomeBonusTest/nova_welcome_bonus_dump.sql');
-        $this->assertGeneratedFileEquals('create_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusTest/create_welcome_bonus_request.json');
-        $this->assertGeneratedFileEquals('create_welcome_bonus_response.json', 'tests/fixtures/NovaWelcomeBonusTest/create_welcome_bonus_response.json');
-        $this->assertGeneratedFileEquals('update_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusTest/update_welcome_bonus_request.json');
+        $this->assertGeneratedFileEquals('create_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusResourceTest/create_welcome_bonus_request.json');
+        $this->assertGeneratedFileEquals('create_welcome_bonus_response.json', 'tests/fixtures/NovaWelcomeBonusResourceTest/create_welcome_bonus_response.json');
+        $this->assertGeneratedFileEquals('update_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusResourceTest/update_welcome_bonus_request.json');
 
         $this->assertEventPushed(
             className: WarningEvent::class,
@@ -206,7 +179,7 @@ public function testSuccess()
             ->setMetaData(['resource_name' => 'WelcomeBonusResource'])
             ->generate();
 
-        $this->assertGeneratedFileEquals('created_resource_test.php', 'tests/NovaWelcomeBonusResourceTest.php');
+        $this->assertGeneratedFileEquals('created_welcome_bonus_resource_test.php', 'tests/NovaWelcomeBonusResourceTest.php');
         $this->assertGeneratedFileEquals('dump.sql', 'tests/fixtures/NovaWelcomeBonusResourceTest/nova_welcome_bonus_dump.sql');
         $this->assertGeneratedFileEquals('create_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusResourceTest/create_welcome_bonus_request.json');
         $this->assertGeneratedFileEquals('create_welcome_bonus_response.json', 'tests/fixtures/NovaWelcomeBonusResourceTest/create_welcome_bonus_response.json');
@@ -225,7 +198,7 @@ public function testWithManySameResources()
 
         $this->assertExceptionThrew(
             className: EntityCreateException::class,
-            message: 'Cannot create NovaWelcomeBonusResource Test cause was found a lot of suitable resources: WelcomeBonusResource, Resources\WelcomeBonus Please, use --resource-name option',
+            message: 'Cannot create NovaWelcomeBonusResourceTest cause was found a lot of suitable resources: WelcomeBonusResource, Resources\WelcomeBonus. Please, use --resource-name option.',
         );
 
         app(NovaTestGenerator::class)
@@ -241,6 +214,9 @@ public function testSuccessWithoutSetMetaData()
         ]);
 
         $this->mockClass(NovaTestGenerator::class, [
+            $this->getCommonNovaResourcesMock([
+                'Resources\PostResource',
+            ]),
             $this->classExistsMethodCall(['models', 'Post']),
             $this->classExistsMethodCall(['nova', 'NovaPostResourceTest'], false),
             $this->classExistsMethodCall(['models', 'User'], false),
@@ -299,7 +275,7 @@ public function testSuccessWithNestedFile(): void
             ->setMetaData(['resource_name' => 'Resources\WelcomeBonusDraftResource'])
             ->generate();
 
-        $this->assertGeneratedFileEquals('created_resource_test.php', 'tests/NovaWelcomeBonusDraftResourceTest.php');
+        $this->assertGeneratedFileEquals('created_welcome_bonuse_draft_resource_test.php', 'tests/NovaWelcomeBonusDraftResourceTest.php');
         $this->assertGeneratedFileEquals('dump.sql', 'tests/fixtures/NovaWelcomeBonusDraftResourceTest/nova_welcome_bonus_dump.sql');
         $this->assertGeneratedFileEquals('create_welcome_bonus_request.json', 'tests/fixtures/NovaWelcomeBonusDraftResourceTest/create_welcome_bonus_request.json');
         $this->assertGeneratedFileEquals('create_welcome_bonus_response.json', 'tests/fixtures/NovaWelcomeBonusDraftResourceTest/create_welcome_bonus_response.json');

tests/Support/Command/CommandMockTrait.php

@@ -120,6 +120,7 @@ public function mockGeneratorSubFolders(): void
             $this->nativeClassExistsMethodCall(['RonasIT\Support\Tests\Support\Command\Models\Forum\Post', true]),
             $this->nativeClassExistsMethodCall(['Laravel\Nova\NovaServiceProvider', true]),
             $this->nativeClassExistsMethodCall(['Laravel\Nova\NovaServiceProvider', true]),
+            $this->nativeClassExistsMethodCall(['App\Nova\Forum\PostResource']),
             $this->nativeClassExistsMethodCall(['RonasIT\Support\Tests\Support\Command\Models\Forum\Post', true]),
         );
     }

tests/Support/Nova/Forum/PostResource.php

@@ -2,57 +2,59 @@
 
 namespace App\Nova\Forum;
 
+use RonasIT\Support\Tests\Support\Command\Models\Forum\Post;
+use Illuminate\Http\Request;
 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;
 use Laravel\Nova\Resource;
 
 class PostResource extends Resource
 {
+    public static $model = Post::class;
+
+    //TODO change field for the title if it required
     public static $title = 'name';
 
+    //TODO change query fields if it required
     public static $search = ['id', 'name'];
 
     public static function label(): string
     {
-        return 'Post';
+        return 'Posts';
     }
 
-    public function fields(NovaRequest $request): array
+    public function fields(Request $request): array
     {
         return [
-            new TextField,
-            new DateField,
+            ID::make('Id')
+                ->required()
+                ->sortable(),
+            Text::make('Title')
+                ->required()
+                ->sortable(),
+            Text::make('Created At')
+                ->required()
+                ->sortable(),
         ];
     }
 
-    public function cards(NovaRequest $request): array
+    public function cards(Request $request): array
     {
         return [];
     }
 
-    public function filters(NovaRequest $request): array
+    public function filters(Request $request): array
     {
-        return [
-            new CreatedAtFilter,
-        ];
+        return [];
     }
 
-    public function lenses(NovaRequest $request): array
+    public function lenses(Request $request): array
     {
         return [];
     }
 
-    public function actions(NovaRequest $request): array
+    public function actions(Request $request): array
     {
-        return [
-            new PublishPostAction,
-            new UnPublishPostAction,
-        ];
+        return [];
     }
-}
+}

tests/Support/Nova/Resources/PostResource.php

@@ -53,7 +53,6 @@ public function actions(NovaRequest $request): array
         return [
             new PublishPostAction,
             new UnPublishPostAction,
-            new UnPublishPostAction,
         ];
     }
 }

tests/Support/Nova/Resources/WelcomeBonus.php

@@ -53,7 +53,6 @@ public function actions(NovaRequest $request): array
         return [
             new PublishPostAction,
             new UnPublishPostAction,
-            new UnPublishPostAction,
         ];
     }
 }