refactor: use getTestingEntityName

Author: RGO230

src/Generators/AbstractTestsGenerator.php

@@ -13,7 +13,6 @@ abstract class AbstractTestsGenerator extends EntityGenerator
     protected array $fakerProperties = [];
     protected array $getFields = [];
     protected bool $withAuth = false;
-    protected string $entity;
 
     const array FIXTURE_TYPES = [
         'create' => ['request', 'response'],
@@ -195,7 +194,7 @@ protected function generateFixtures(): void
                 foreach ($modifications as $modification) {
                     $excepts = ($modification === 'request') ? ['id'] : [];
 
-                    $this->generateFixture("{$type}_" . Str::snake($this->entity) . "_{$modification}.json", Arr::except($object, $excepts));
+                    $this->generateFixture("{$type}_" . Str::snake($this->getTestingEntityName()) . "_{$modification}.json", Arr::except($object, $excepts));
                 }
             }
         }
@@ -259,6 +258,8 @@ abstract protected function isFixtureNeeded($type): bool;
 
     abstract protected function generateTests(): void;
 
+    abstract protected function getTestingEntityName(): string;
+
     private function filterBadModelField($fields): array
     {
         return array_diff($fields, [

src/Generators/NovaTestGenerator.php

@@ -21,13 +21,6 @@ class NovaTestGenerator extends AbstractTestsGenerator
     public function generate(): void
     {
         if (class_exists(NovaServiceProvider::class)) {
-            if ($this->classExists('nova', "Nova{$this->model}ResourceTest")) {
-
-                $path = $this->getClassPath('nova', "Nova{$this->model}ResourceTest");
-
-                throw new ResourceAlreadyExistsException($path);
-            }
-
             $novaResources = $this->getCommonNovaResources();
 
             if (count($novaResources) > 1) {
@@ -51,7 +44,11 @@ public function generate(): void
 
             $this->novaResourceClassName = Arr::first($novaResources);
 
-            $this->entity = Str::afterLast($this->novaResourceClassName, '\\');
+            if ($this->classExists('nova', "Nova{$this->getTestingEntityName()}Test")) {
+                $path = $this->getClassPath('nova', "Nova{$this->getTestingEntityName()}Test");
+
+                throw new ResourceAlreadyExistsException($path);
+            }
 
             parent::generate();
         } else {
@@ -71,19 +68,19 @@ public function generateTests(): void
         $fileContent = $this->getStub('nova_test', [
             'entity_namespace' => $this->getNamespace('models', $this->modelSubFolder),
             'entity' => $this->model,
-            'resource_name' => $this->entity,
+            'resource_name' => $this->getTestingEntityName(),
             'resource_namespace' => $this->novaResourceClassName,
-            'snake_resource' => Str::snake($this->entity),
+            'snake_resource' => Str::snake($this->getTestingEntityName()),
             'dromedary_entity' => Str::lcfirst($this->model),
             'lower_entities' => $this->getPluralName(Str::snake($this->model)),
             'actions' => $actions,
             'filters' => $filters,
             'models_namespace' => $this->getNamespace('models'),
         ]);
 
-        $this->saveClass('tests', "Nova{$this->model}ResourceTest", $fileContent);
+        $this->saveClass('tests', $this->getTestClassName(), $fileContent);
 
-        event(new SuccessCreateMessage("Created a new Nova test: Nova{$this->model}ResourceTest"));
+        event(new SuccessCreateMessage("Created a new Nova test: {$this->getTestClassName()}"));
     }
 
     protected function getActions(): array
@@ -161,7 +158,7 @@ protected function loadNovaFilters()
 
     public function getTestClassName(): string
     {
-        return "Nova{$this->entity}Test";
+        return "Nova{$this->getTestingEntityName()}Test";
     }
 
     protected function isFixtureNeeded($type): bool
@@ -219,8 +216,13 @@ protected function getFilters(): array
 
     protected function getDumpName(): string
     {
-        $entityName = Str::snake($this->entity);
+        $entityName = Str::snake($this->getTestingEntityName());
 
         return "nova_{$entityName}_dump.sql";
     }
+
+    protected function getTestingEntityName(): string
+    {
+        return Str::afterLast($this->novaResourceClassName, '\\');
+    }
 }

src/Generators/TestsGenerator.php

@@ -60,4 +60,9 @@ protected function generateTests(): void
 
         event(new SuccessCreateMessage($createMessage));
     }
+
+    protected function getTestingEntityName(): string
+    {
+        return $this->model;
+    }
 }

tests/NovaTestGeneratorTest.php

@@ -68,6 +68,9 @@ public function testGenerateNovaTestAlreadyExists()
 
         $this->mockClass(NovaTestGenerator::class, [
             $this->classExistsMethodCall(['nova', 'NovaPostResourceTest']),
+            $this->getCommonNovaResourcesMock([
+                'PostResource',
+            ]),
         ]);
 
         $this->assertExceptionThrew(