feature tests

Author: pxpm

src/BackpackServiceProvider.php

@@ -181,6 +181,7 @@ public function publishFiles()
             __DIR__.'/resources/views/ui/inc/menu_items.blade.php' => resource_path('views/vendor/backpack/ui/inc/menu_items.blade.php'),
         ];
         $backpack_custom_routes_file = [__DIR__.$this->customRoutesFilePath => base_path($this->customRoutesFilePath)];
+        $backpack_stubs = [__DIR__.'/resources/stubs/crud-testing' => resource_path('views/vendor/backpack/crud/stubs/crud-testing')];
 
         // calculate the path from current directory to get the vendor path
         $vendorPath = dirname(__DIR__, 3);
@@ -202,6 +203,7 @@ public function publishFiles()
         $this->publishes($backpack_views, 'views');
         $this->publishes($backpack_menu_contents_view, 'menu_contents');
         $this->publishes($backpack_custom_routes_file, 'custom_routes');
+        $this->publishes($backpack_stubs, 'stubs');
         $this->publishes($gravatar_assets, 'gravatar');
         $this->publishes($minimum, 'minimum');
     }

src/app/Console/Commands/GenerateCrudTests.php

@@ -19,8 +19,7 @@ class GenerateCrudTests extends Command
                             {--operation= : Only generate tests for the given CRUD operation}
                             {--type= : The type of test to generate (browser or feature)}
                             {--framework=phpunit : The testing framework to use (phpunit or pest)}
-                            {--force : Overwrite existing test classes}
-                            {--dry-run : Show what would be generated without writing files}';
+                            {--force : Overwrite existing test classes}';
 
     /**
      * The console command description.
@@ -107,8 +106,8 @@ public function handle(): int
 
         $this->info('Test generation finished.');
 
-        if (! empty($this->generatedFiles) && $this->confirm('Do you want to run the generated tests now?', true)) {
-            $this->runGeneratedTests();
+        if (! empty($this->generatedFiles)) {
+            $this->info('To run the tests call: php artisan test');
         }
 
         return self::SUCCESS;
@@ -131,7 +130,13 @@ protected function runGeneratedTests(): void
             $binaryPath = base_path("vendor/bin/{$binary}");
 
             if (file_exists($binaryPath)) {
-                $command = '"'.PHP_BINARY.'" "'.$binaryPath.'" '.implode(' ', array_map(fn ($f) => '"'.$f.'"', $featureTests));
+                $command = '"'.PHP_BINARY.'" "'.$binaryPath.'"';
+
+                if (file_exists(base_path('phpunit.xml'))) {
+                    $command .= ' --configuration "'.base_path('phpunit.xml').'"';
+                }
+
+                $command .= ' '.implode(' ', array_map(fn ($f) => '"'.$f.'"', $featureTests));
                 passthru($command);
             } elseif ($framework === 'phpunit' && $this->getApplication()->has('test')) {
                 $this->call('test', ['args' => $featureTests]);
@@ -219,7 +224,7 @@ protected function generateTestForOperation(array $controllerInfo, string $opera
             $operationStubPath = $this->getStubPath('operations/'.$stubName);
 
             if (! File::exists($operationStubPath)) {
-                $this->skippedOperations[$controllerInfo['short_name']][] = $operation;
+                $this->skippedOperations[$controllerInfo['short_name']][] = "$operation ($type)";
                 return;
             }
 
@@ -231,15 +236,31 @@ protected function generateTestForOperation(array $controllerInfo, string $opera
                 return;
             }
 
+            // Replace __MARK_TEST_AS_SKIPPED__ placeholder
+            $hasFactory = $model && class_exists($model) && method_exists($model, 'factory') && file_exists(database_path('factories/'.class_basename($model).'Factory.php'));
+            
+            if ($hasFactory) {
+                // If the model has a factory, remove the placeholder
+                $methods = str_replace('__MARK_TEST_AS_SKIPPED__', '', $methods);
+            } else {
+                // If no factory, mark the test as skipped
+                $methods = str_replace(
+                    '__MARK_TEST_AS_SKIPPED__', 
+                    '$this->markTestSkipped(\'Factory not found for model \' . $this->model);', 
+                    $methods
+                );
+            }
+
             $className = $this->resolveClassName($controllerInfo, $operation);
 
-            $controllerName = Str::replaceLast('Controller', '', $controllerInfo['short_name']);
+            $controllerShortName = Str::replaceLast('Controller', '', $controllerInfo['short_name']);
+            $controllerRelPath = $this->getRelativeNamespace($controllerInfo['class']);
 
             $namespace = $type === 'feature'
-                ? 'Tests\\Feature\\'.$controllerName
-                : 'Tests\\Browser\\'.$controllerName;
+                ? 'Tests\\Feature\\'.$controllerRelPath
+                : 'Tests\\Browser\\'.$controllerRelPath;
 
-            $baseClassName = $controllerName.'TestBase';
+            $baseClassName = $controllerShortName.'TestBase';
             $this->ensureBaseTestClassExists($namespace, $baseClassName, $controllerInfo, $config, $type);
 
             $operationConfig = $this->extractOperationConfig($config);
@@ -262,20 +283,14 @@ protected function generateTestForOperation(array $controllerInfo, string $opera
                 'methods' => $methods,
             ]);
 
-            $filePath = $this->determineOutputPath($className, $controllerName, $type);
+            $filePath = $this->determineOutputPath($className, $controllerRelPath, $type);
 
             if ($this->shouldSkipExisting($filePath)) {
                 $this->line("  ⏭️  Skipping {$operation} (file exists, use --force to overwrite)");
 
                 return;
             }
 
-            if ($this->option('dry-run')) {
-                $this->line("  📝 Would write {$filePath}");
-
-                return;
-            }
-
             File::ensureDirectoryExists(dirname($filePath));
             File::put($filePath, $testClass);
 
@@ -318,7 +333,7 @@ protected function shouldSkipExisting(string $filePath): bool
      */
     protected function ensureBaseTestClassExists(string $namespace, string $className, array $controllerInfo, array $config, string $type): void
     {
-        $controllerName = Str::replaceLast('Controller', '', $controllerInfo['short_name']);
+        $controllerName = $this->getRelativeNamespace($controllerInfo['class']);
         $filePath = $this->determineOutputPath($className, $controllerName, $type);
 
         if (in_array($filePath, $this->generatedBaseClasses)) {
@@ -565,7 +580,8 @@ protected function determineOutputPath(string $className, string $controllerName
             : base_path('tests/Browser');
 
         if ($controllerName) {
-            $baseDir .= DIRECTORY_SEPARATOR.$controllerName;
+            $pathFn = fn($path) => str_replace('\\', DIRECTORY_SEPARATOR, $path);
+            $baseDir .= DIRECTORY_SEPARATOR.$pathFn($controllerName);
         }
 
         if (! File::isDirectory($baseDir)) {
@@ -597,28 +613,54 @@ protected function normalizeRoute(string $route): string
     }
 
     /**
-     * Get the path to a stub file, respecting the chosen framework.
+     * Get the path to a stub file, respecting the chosen framework and published stubs.
      */
     protected function getStubPath(string $name): string
     {
         $framework = $this->option('framework');
-        $basePath = __DIR__.'/../../../resources/stubs/crud-testing/';
 
-        // If framework is defined and not default, try to find framework-specific stub
-        if ($framework && $framework !== 'phpunit') {
-            // First try nested directory: frameworks/{framework}/{stub}
-            $namespaced = $basePath . $framework . '/' . $name;
-            if (File::exists($namespaced)) {
-                return $namespaced;
+        $searchPaths = [
+            resource_path('views/vendor/backpack/crud/stubs/crud-testing/'),
+            __DIR__.'/../../../resources/stubs/crud-testing/',
+        ];
+
+        foreach ($searchPaths as $basePath) {
+            // If framework is defined and not default, try to find framework-specific stub
+            if ($framework && $framework !== 'phpunit') {
+                // First try nested directory: frameworks/{framework}/{stub}
+                $namespaced = $basePath . $framework . '/' . $name;
+                if (File::exists($namespaced)) {
+                    return $namespaced;
+                }
+                
+                // Then try prefixed: {framework}-{stub}
+                $prefixed = $basePath . $framework . '-' . $name;
+                if (File::exists($prefixed)) {
+                    return $prefixed;
+                }
             }
-            
-            // Then try prefixed: {framework}-{stub}
-            $prefixed = $basePath . $framework . '-' . $name;
-            if (File::exists($prefixed)) {
-                return $prefixed;
+
+            if (File::exists($basePath . $name)) {
+                return $basePath . $name;
             }
         }
 
-        return $basePath . $name;
+        return __DIR__.'/../../../resources/stubs/crud-testing/' . $name;
+    }
+
+    /**
+     * Get the relative namespace for the test class based on controller structure.
+     */
+    protected function getRelativeNamespace(string $controllerClass): string
+    {
+        $rootNamespace = 'App\\Http\\Controllers\\';
+        
+        if (Str::startsWith($controllerClass, $rootNamespace)) {
+            $relative = Str::after($controllerClass, $rootNamespace);
+        } else {
+            $relative = class_basename($controllerClass);
+        }
+
+        return Str::replaceLast('Controller', '', $relative);
     }
 }

src/app/Library/CrudPanel/Traits/Input.php

@@ -21,7 +21,7 @@ trait Input
      * @param  bool|string  $relationMethod
      * @return array
      */
-    private function splitInputIntoDirectAndRelations($inputs, $relationDetails = null, $relationMethod = false)
+    public function splitInputIntoDirectAndRelations($inputs, $relationDetails = null, $relationMethod = false)
     {
         $crudFields = $relationDetails['crudFields'] ?? [];
         $model = $relationDetails['model'] ?? false;

src/app/Library/CrudTesting/CrudControllerDiscovery.php

@@ -7,6 +7,7 @@
 use Illuminate\Support\Str;
 use ReflectionClass;
 use Backpack\CRUD\CrudManager;
+use Illuminate\Support\Facades\Route;
 
 /**
  * Discovers CrudControllers in the application and extracts their configuration.
@@ -21,7 +22,10 @@ class CrudControllerDiscovery
      */
     public static function discover($paths = null): array
     {
-        $paths = $paths ?? [app_path('Http/Controllers')];
+        if ($paths === null) {
+            $paths = config('backpack.testing.controllers_path', app_path('Http/Controllers'));
+        }
+        
         $paths = is_array($paths) ? $paths : [$paths];
 
         $controllers = [];
@@ -86,10 +90,18 @@ public static function analyzeController(string $controllerClass): array
      */
     protected static function getOperations(ReflectionClass $reflection): array
     {
-        $traits = $reflection->getTraitNames();
+        $traits = [];
+        $currentReflection = $reflection;
+
+        // Collect traits from the class and all its parents
+        while ($currentReflection) {
+            $traits = array_merge($traits, $currentReflection->getTraitNames());
+            $currentReflection = $currentReflection->getParentClass();
+        }
+
         $operations = [];
 
-        foreach ($traits as $trait) {
+        foreach (array_unique($traits) as $trait) {
             try {
                 $traitReflection = new ReflectionClass($trait);
             } catch (\ReflectionException $e) {
@@ -168,20 +180,38 @@ protected static function getClassNameFromFile(string $filePath): ?string
      */
     public static function buildCrudPanel(string $controllerClass, string $operation = 'list'): object
     {
+        self::clearCrudPanelBindings($controllerClass);
+
+        TestConfigHelper::applyConfiguration($controllerClass, $operation);
+        
         $controller = app()->make($controllerClass);
-        $request = request([
-            'operation' => $operation
-        ]);
+        
         if (! CrudManager::hasCrudPanel($controllerClass)) {
 
-            $controller->initializeCrudPanel($request);
+            $controller->initializeCrudPanel(request());
 
             return CrudManager::getCrudPanel($controllerClass);
         }
 
         $controller->setupCrudController($operation);
 
         return CrudManager::getCrudPanel($controller);
+
+        
+    }
+
+    private static function clearCrudPanelBindings(): void
+    {
+         if (app()->bound('crud')) {
+            app()->forgetInstance('crud');
+            app()->forgetInstance(\Backpack\CRUD\app\Library\CrudPanel\CrudPanel::class);
+        }
 
+        if (app()->bound('CrudManager')) {
+            app()->forgetInstance('CrudManager');
+        }
+
+        \Illuminate\Support\Facades\Facade::clearResolvedInstance('CrudManager');
+        \Illuminate\Support\Facades\Facade::clearResolvedInstance('crud');
     }
 }