Merge pull request #16 from RonasIT/11_fix_init_command

fix: init command

Author: DenTray

src/Commands/InitCommand.php

@@ -53,11 +53,12 @@ class InitCommand extends Command implements Isolatable
 
     protected string $readmeContent = '';
 
-    protected array $composerCommands = [
+    protected array $shellCommands = [
         'composer require ronasit/laravel-helpers',
         'composer require ronasit/laravel-swagger',
-        'composer require laravel/telescope',
         'composer require --dev ronasit/laravel-entity-generator',
+        'composer require laravel/telescope',
+        'php artisan telescope:install',
     ];
 
     public function handle(): void
@@ -123,18 +124,17 @@ public function handle(): void
         }
 
         if ($this->confirm('Do you want to install media package?')) {
-            $this->composerCommands[] = 'composer require ronasit/laravel-media';
+            $this->shellCommands[] = 'composer require ronasit/laravel-media';
         }
 
         if ($this->confirm('Do you want to uninstall project-initializator package?', true)) {
-            $this->composerCommands[] = 'composer remove --dev ronasit/laravel-project-initializator';
+            $this->shellCommands[] = 'composer remove --dev ronasit/laravel-project-initializator';
         }
 
-        foreach ($this->composerCommands as $composerCommand) {
-            shell_exec("{$composerCommand} --ansi");
+        foreach ($this->shellCommands as $shellCommand) {
+            shell_exec("{$shellCommand} --ansi");
         }
 
-        Artisan::call('telescope:install');
         Artisan::call('migrate');
     }
 

tests/InitCommandTest.php

@@ -2,21 +2,12 @@
 
 namespace RonasIT\ProjectInitializator\Tests;
 
-use Illuminate\Support\Facades\Artisan;
-use RonasIT\ProjectInitializator\Tests\Support\TelescopeInstallCommand;
 use RonasIT\ProjectInitializator\Tests\Support\Traits\InitCommandMockTrait;
 
 class InitCommandTest extends TestCase
 {
     use InitCommandMockTrait;
 
-    public function setUp(): void
-    {
-        parent::setUp();
-
-        Artisan::registerCommand(new TelescopeInstallCommand());
-    }
-
     public function testRunWithoutAdminAndReadmeCreation()
     {
         $this->mockFileGetContent(
@@ -35,8 +26,9 @@ public function testRunWithoutAdminAndReadmeCreation()
         $this->mockShellExec(
             ['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
             ['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
-            ['arguments' => 'composer require laravel/telescope --ansi'],
             ['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
+            ['arguments' => 'composer require laravel/telescope --ansi'],
+            ['arguments' => 'php artisan telescope:install --ansi'],
         );
 
         $this
@@ -75,8 +67,9 @@ public function testRunWithAdminAndWithoutReadmeCreation()
         $this->mockShellExec(
             ['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
             ['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
-            ['arguments' => 'composer require laravel/telescope --ansi'],
             ['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
+            ['arguments' => 'composer require laravel/telescope --ansi'],
+            ['arguments' => 'php artisan telescope:install --ansi'],
         );
 
         $this
@@ -158,8 +151,9 @@ public function testRunWithAdminAndDefaultReadmeCreation()
             ['arguments' => 'git ls-remote --get-url origin', 'result' => 'https://github.com/ronasit/laravel-helpers.git'],
             ['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
             ['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
-            ['arguments' => 'composer require laravel/telescope --ansi'],
             ['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
+            ['arguments' => 'composer require laravel/telescope --ansi'],
+            ['arguments' => 'php artisan telescope:install --ansi'],
         );
 
         $this
@@ -280,8 +274,9 @@ public function testRunWithAdminAndPartialReadmeCreation()
         $this->mockShellExec(
             ['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
             ['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
-            ['arguments' => 'composer require laravel/telescope --ansi'],
             ['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
+            ['arguments' => 'composer require laravel/telescope --ansi'],
+            ['arguments' => 'php artisan telescope:install --ansi'],
         );
 
         $this
@@ -406,8 +401,9 @@ public function testRunWithAdminAndFullReadmeCreationAndRemovingInitializatorIns
             ['arguments' => 'git ls-remote --get-url origin', 'result' => 'https://github.com/ronasit/laravel-helpers.git'],
             ['arguments' => 'composer require ronasit/laravel-helpers --ansi'],
             ['arguments' => 'composer require ronasit/laravel-swagger --ansi'],
-            ['arguments' => 'composer require laravel/telescope --ansi'],
             ['arguments' => 'composer require --dev ronasit/laravel-entity-generator --ansi'],
+            ['arguments' => 'composer require laravel/telescope --ansi'],
+            ['arguments' => 'php artisan telescope:install --ansi'],
             ['arguments' => 'composer require ronasit/laravel-media --ansi'],
             ['arguments' => 'composer remove --dev ronasit/laravel-project-initializator --ansi'],
         );