refactor: ModuleMakeCommandTest - remove unused modulePath variable and update path assertions for consistency

Author: solomon-ochepa

tests/Commands/Make/ModuleMakeCommandTest.php

@@ -61,6 +61,7 @@ public function test_it_generates_module_folders()
         foreach (config('modules.paths.generator') as $directory) {
             $this->assertDirectoryExists($this->module_path($directory['path']));
         }
+
         $this->assertSame(0, $code);
     }
 
@@ -72,6 +73,7 @@ public function test_it_generates_module_files()
             $path = $this->module_path($file);
             $this->assertTrue($this->finder->exists($path), "[$file] does not exists");
         }
+
         $path = $this->module_path('module.json');
 
         $this->assertTrue($this->finder->exists($path), '[module.json] does not exists');
@@ -189,46 +191,48 @@ public function test_it_generates_module_namespace_using_studly_case()
     {
         $code = $this->artisan('module:make', ['name' => ['ModuleName']]);
 
-        $file = $this->finder->get($this->module_path('app/Providers/ModuleNameServiceProvider.php', 'ModuleName'));
+        $file = $this->finder->get($this->module_app_path('app/Providers/ModuleNameServiceProvider.php', 'ModuleName'));
 
         $this->assertMatchesSnapshot($file);
         $this->assertSame(0, $code);
     }
 
     public function test_it_generates_a_plain_module_with_no_resources()
     {
-        $code = $this->artisan('module:make', ['name' => ['ModuleName'], '--plain' => true]);
+        $code = $this->artisan('module:make', ['name' => ['Blog'], '--plain' => true]);
 
-        $path = $this->module_path('Providers/ModuleNameServiceProvider.php', 'ModuleName');
+        $path = $this->module_app_path('app/Providers/BlogServiceProvider.php');
         $this->assertFalse($this->finder->exists($path));
 
-        $path = $this->module_path('Http/Controllers/ModuleNameController.php', 'ModuleName');
+        $path = $this->module_app_path('app/Http/Controllers/BlogController.php');
         $this->assertFalse($this->finder->exists($path));
 
-        $path = $this->module_path('Database/Seeders/ModuleNameDatabaseSeeder.php', 'ModuleName');
+        $path = $this->module_path('database/seeders/BlogDatabaseSeeder.php');
         $this->assertFalse($this->finder->exists($path));
 
         $this->assertSame(0, $code);
     }
 
     public function test_it_generates_a_plain_module_with_no_files()
     {
-        $code = $this->artisan('module:make', ['name' => ['ModuleName'], '--plain' => true]);
+        $code = $this->artisan('module:make', ['name' => ['Blog'], '--plain' => true]);
 
         foreach (config('modules.stubs.files') as $file) {
-            $path = $this->module_path($file, 'ModuleName');
+            $path = $this->module_path($file);
             $this->assertFalse($this->finder->exists($path), "[$file] exists");
         }
-        $path = $this->module_path('module.json', 'ModuleName');
+
+        $path = $this->module_path('module.json');
+
         $this->assertTrue($this->finder->exists($path), '[module.json] does not exists');
         $this->assertSame(0, $code);
     }
 
     public function test_it_generates_plain_module_with_no_service_provider_in_modulejson_file()
     {
-        $code = $this->artisan('module:make', ['name' => ['ModuleName'], '--plain' => true]);
+        $code = $this->artisan('module:make', ['name' => ['Blog'], '--plain' => true]);
 
-        $path = $this->module_path('module.json', 'ModuleName');
+        $path = $this->module_path('module.json');
         $content = json_decode($this->finder->get($path));
 
         $this->assertCount(0, $content->providers);
@@ -324,25 +328,28 @@ public function test_it_can_ignore_some_folders_to_generate_with_new_format()
 
     public function test_it_can_ignore_resource_folders_to_generate()
     {
-        $this->app['config']->set(
-            'modules.paths.generator.seeder',
-            ['path' => 'Database/Seeders', 'generate' => false]
-        );
-        $this->app['config']->set('modules.paths.generator.provider', ['path' => 'Providers', 'generate' => false]);
-        $this->app['config']->set(
-            'modules.paths.generator.route-provider',
-            ['path' => 'Providers', 'generate' => false]
-        );
-        $this->app['config']->set(
-            'modules.paths.generator.controller',
-            ['path' => 'Http/Controllers', 'generate' => false]
-        );
+        $this->app['config']->set('modules.paths.generator.seeder', [
+            'path' => 'database/seeders',
+            'generate' => false,
+        ]);
+        $this->app['config']->set('modules.paths.generator.provider', [
+            'path' => 'app/Providers',
+            'generate' => false,
+        ]);
+        $this->app['config']->set('modules.paths.generator.route-provider', [
+            'path' => 'app/Providers',
+            'generate' => false,
+        ]);
+        $this->app['config']->set('modules.paths.generator.controller', [
+            'path' => 'app/Http/Controllers',
+            'generate' => false,
+        ]);
 
         $code = $this->artisan('module:make', ['name' => ['Blog']]);
 
-        $this->assertFileDoesNotExist($this->module_path('Database/Seeders'));
-        $this->assertFileDoesNotExist($this->module_path('Providers'));
-        $this->assertFileDoesNotExist($this->module_path('Http/Controllers'));
+        $this->assertFileDoesNotExist($this->module_path('database/seeders'));
+        $this->assertFileDoesNotExist($this->module_app_path('app/Providers'));
+        $this->assertFileDoesNotExist($this->module_app_path('app/Http/Controllers'));
         $this->assertSame(0, $code);
     }
 
@@ -362,17 +369,20 @@ public function test_it_generates_disabled_module_with_disabled_flag()
         $this->assertSame(0, $code);
     }
 
-    public function test_it_generes_module_with_new_provider_location()
+    public function test_it_generes_module_with_custom_provider_location()
     {
         $this->app['config']->set('modules.paths.generator.provider', ['path' => 'Base/Providers', 'generate' => true]);
 
         $code = $this->artisan('module:make', ['name' => ['Blog']]);
 
         $this->assertDirectoryExists($this->module_path('Base/Providers'));
+
         $file = $this->finder->get($this->module_path('module.json'));
         $this->assertMatchesSnapshot($file);
+
         $file = $this->finder->get($this->module_path('composer.json'));
         $this->assertMatchesSnapshot($file);
+
         $this->assertSame(0, $code);
     }
 

tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generes_module_with_custom_provider_location__1.txt

@@ -0,0 +1,11 @@
+{
+    "name": "Blog",
+    "alias": "blog",
+    "description": "",
+    "keywords": [],
+    "priority": 0,
+    "providers": [
+        "Modules\\Blog\\Base\\Providers\\BlogServiceProvider"
+    ],
+    "files": []
+}

tests/Commands/Make/__snapshots__/ModuleMakeCommandTest__test_it_generes_module_with_custom_provider_location__2.txt

@@ -0,0 +1,30 @@
+{
+    "name": "nwidart/blog",
+    "description": "",
+    "authors": [
+        {
+            "name": "Nicolas Widart",
+            "email": "[email protected]"
+        }
+    ],
+    "extra": {
+        "laravel": {
+            "providers": [],
+            "aliases": {
+
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Modules\\Blog\\App\\": "app/",
+            "Modules\\Blog\\Database\\Factories\\": "database/factories/",
+            "Modules\\Blog\\Database\\Seeders\\": "database/seeders/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Modules\\Blog\\Tests\\": "tests/"
+        }
+    }
+}