wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Dec 9, 2024 · bc21766 · bc21766
1 parent 8333d21
commit bc21766
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -109,11 +109,9 @@ protected function copyTestbenchDotEnvFile(Filesystem $filesystem, string $worki
 
         $choices = Collection::make($this->environmentFiles())
             ->reject(static fn ($file) => $filesystem->isFile(join_paths($workbenchWorkingPath, $file)))
-            ->values()
-            ->prepend('Skip exporting .env')
-            ->all();
+            ->values();
 
-        if (! $this->option('force') && empty($choices)) {
+        if (! $this->option('force') && $choices->isEmpty()) {
             $this->components->twoColumnDetail(
                 'File [.env] already exists', '<fg=yellow;options=bold>SKIPPED</>'
             );
@@ -122,7 +120,10 @@ protected function copyTestbenchDotEnvFile(Filesystem $filesystem, string $worki
         }
 
         /** @var string|null $targetEnvironmentFile */
-        $targetEnvironmentFile = $this->components->choice("Export '.env' file as?", $choices);
+        $targetEnvironmentFile = $this->components->choice(
+            "Export '.env' file as?",
+            $choices->prepend('Skip exporting .env')->all()
+        );
 
         if (\is_null($targetEnvironmentFile) || $targetEnvironmentFile === 'Skip exporting .env') {
             return;
@@ -132,10 +133,6 @@ protected function copyTestbenchDotEnvFile(Filesystem $filesystem, string $worki
 
         $this->generateSeparateEnvironmentFileForTestbenchDusk($filesystem, $workbenchWorkingPath, $targetEnvironmentFile);
 
-        if ($this->hasTestbenchDusk === true) {
-
-        }
-
         (new GeneratesFile(
             filesystem: $filesystem,
             components: $this->components,

diff --git a/tests/Console/CommandTestCase.php b/tests/Console/CommandTestCase.php
@@ -105,6 +105,7 @@ protected function assertFromEnvironmentFileDataProviders(?string $answer, bool
      */
     public static function environmentFileDataProviders()
     {
+        yield [null, false];
         yield ['Skip exporting .env', false];
         yield ['.env', true];
         yield ['.env.example', true];

diff --git a/tests/Console/InstallCommandTest.php b/tests/Console/InstallCommandTest.php
@@ -2,6 +2,7 @@
 
 namespace Orchestra\Workbench\Tests\Console;
 
+use Illuminate\Filesystem\Filesystem;
 use Orchestra\Testbench\Foundation\Config;
 
 use function Orchestra\Testbench\default_skeleton_path;
@@ -18,7 +19,7 @@ public function it_can_run_installation_command_with_devtool(?string $answer, bo
     {
         $workingPath = static::stubWorkingPath();
 
-        $this->artisan('workbench:install', ['--devtool' => true, '--no-interaction' => true])
+        $this->artisan('workbench:install', ['--devtool' => true])
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',
@@ -58,7 +59,7 @@ public function it_can_run_installation_command_without_devtool(?string $answer,
     {
         $workingPath = static::stubWorkingPath();
 
-        $this->artisan('workbench:install', ['--no-devtool' => true, '--no-interaction' => true])
+        $this->artisan('workbench:install', ['--no-devtool' => true])
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',
@@ -98,7 +99,7 @@ public function it_can_run_basic_installation_command_without_devtool(?string $a
     {
         $workingPath = static::stubWorkingPath();
 
-        $this->artisan('workbench:install', ['--basic' => true, '--no-devtool' => true, '--no-interaction' => true])
+        $this->artisan('workbench:install', ['--basic' => true, '--no-devtool' => true])
             ->expectsChoice("Export '.env' file as?", $answer, [
                 'Skip exporting .env',
                 '.env',
@@ -120,4 +121,23 @@ public function it_can_run_basic_installation_command_without_devtool(?string $a
         $this->assertExecuteInstallWithoutDevTool();
         $this->assertFromEnvironmentFileDataProviders($answer, $createEnvironmentFile);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_ignore_generating_environment_file_if_it_already_exists()
+    {
+        $filesystem = new Filesystem;
+        $workingPath = static::stubWorkingPath();
+
+        $filesystem->ensureDirectoryExists(join_paths($workingPath, 'workbench'));
+        collect(['.env', '.env.example', '.env.dist'])
+            ->each(function ($env) use ($filesystem, $workingPath) {
+                $filesystem->put(join_paths($workingPath, 'workbench', $env), '');
+            });
+
+        $this->artisan('workbench:install', ['--basic' => true, '--no-devtool' => true])
+            ->expectsOutputToContain('File [.env] already exists')
+            ->assertSuccessful();
+    }
 }