Merge pull request #205 from RonasIT/140-use-NovaResource-class-in-NovaTestGenerator-instead-of-Model

fix: use relative nova path for check nova resource namespace

Author: DenTray

src/Generators/NovaTestGenerator.php

@@ -17,17 +17,8 @@
 
 class NovaTestGenerator extends AbstractTestsGenerator
 {
-    protected string $novaPath;
-
     protected string $novaResourceClassName;
 
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->novaPath = base_path($this->paths['nova']);
-    }
-
     public function generate(): void
     {
         if (class_exists(NovaServiceProvider::class)) {
@@ -116,7 +107,7 @@ protected function getActions(): array
 
     protected function getNovaFiles(): Generator
     {
-        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->novaPath));
+        $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(base_path($this->paths['nova'])));
 
         foreach ($iterator as $file) {
             if ($file->isFile() && $file->getExtension() === 'php') {
@@ -130,11 +121,11 @@ protected function getCommonNovaResources(): array
         $resources = [];
 
         foreach ($this->getNovaFiles() as $file) {
-            $relativePath = Str::after($file->getPathname(), $this->novaPath . DIRECTORY_SEPARATOR);
+            $relativePath = Str::after($file->getPathname(), $this->paths['nova'] . DIRECTORY_SEPARATOR);
 
             $class = Str::before($relativePath, '.');
 
-            $className = $this->pathToNamespace($this->novaPath . DIRECTORY_SEPARATOR . $class);
+            $className = $this->pathToNamespace($this->paths['nova'] . DIRECTORY_SEPARATOR . $class);
 
             if ($this->isResourceNameContainModel($className) && $this->isNovaResource($className)) {
                 $resources[] = $className;

tests/Support/Command/CommandMockTrait.php

@@ -52,7 +52,6 @@ public function mockGenerator(): void
             $this->nativeClassExistsMethodCall(['RonasIT\Support\Tests\Support\Command\Models\Post', true]),
             $this->nativeClassExistsMethodCall(['Laravel\Nova\NovaServiceProvider', true]),
             $this->nativeClassExistsMethodCall(['Laravel\Nova\NovaServiceProvider', true]),
-            $this->nativeUcwordsMethodCall(['vfs:\\\\root\\app\\Nova\\PostResource', '\\'], 'App\Nova\PostResource'),
             $this->nativeIsSubClassOfMethodCall(['App\Nova\PostResource', 'Laravel\\Nova\\Resource']),
             $this->nativeClassExistsMethodCall(['RonasIT\Support\Tests\Support\Command\Models\Post', true]),
         );
@@ -79,7 +78,6 @@ 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->nativeUcwordsMethodCall(['vfs:\\\\root\\app\\Nova\\Forum\\PostResource', '\\'], 'App\Nova\Forum\PostResource'),
             $this->nativeIsSubClassOfMethodCall(['App\Nova\Forum\PostResource', 'Laravel\\Nova\\Resource']),
             $this->nativeClassExistsMethodCall(['RonasIT\Support\Tests\Support\Command\Models\Forum\Post', true]),
         );
@@ -89,9 +87,4 @@ public function nativeIsSubClassOfMethodCall(array $arguments, bool $result = tr
     {
         return $this->functionCall('is_subclass_of', $arguments, $result);
     }
-
-    public function nativeUcwordsMethodCall(array $arguments, string $result): array
-    {
-        return $this->functionCall('ucwords', $arguments, $result);
-    }
-}
+}