Bugfix

Add more tests

Author: JunaidQadirB

src/Console/Commands/ControllerMakeCommand.php

@@ -186,9 +186,11 @@ protected function buildModelReplacements(array $replace)
         $modelSlug = Str::slug(Str::plural($label, 2));
         $viewDir = $modelSlug;
         $routeBase = $modelSlug;
-        if ($this->option('views-dir')) {
-            $viewDir = $this->option('views-dir');
-            $viewDir = str_replace('/', '.', $viewDir);
+
+        $dir = $this->option('views-dir');
+        if ($dir) {
+            $dir = str_replace('/', '.', $dir);
+            $viewDir = $dir . '.' . $modelSlug;
         }
 
         if ($this->option('route-base')) {

tests/Feature/CrayCommandTest.php

@@ -153,6 +153,10 @@ public function test_it_generates_view_paths_correctly_when_subdirectory_is_spec
     {
         $this->artisan('cray Models/Post --controller-dir=dashboard --views-dir=dashboard/system');
         $createBladeView = file_get_contents(resource_path('views/dashboard/system/posts/create.blade.php'));
-        $this->assertStringContainsString("@include('dashboard.system.posts._form')", $createBladeView,'Include path is correct');
+        $postController = file_get_contents(app_path('Http/Controllers/Dashboard/PostController.php'));
+
+        $this->assertStringContainsString("@include('dashboard.system.posts._form')", $createBladeView,'Include path is incorrect');
+
+        $this->assertStringContainsString("return view('dashboard.system.posts.index'", $postController,'View path is incorrect');
     }
 }