Merge pull request #224 from abenerd/feature/drop-databases-parallel-…

…flag Add drop databases flag for parity with laravel
nunomaduro · Apr 5, 2022 · f3f9498 · f3f9498
2 parents 7534dd6 + dd82302
commit f3f9498
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/Adapters/Laravel/Commands/TestCommand.php b/src/Adapters/Laravel/Commands/TestCommand.php
@@ -34,6 +34,7 @@ class TestCommand extends Command
         {--min= : Indicates the minimum threshold enforcement for code coverage}
         {--p|parallel : Indicates if the tests should run in parallel}
         {--recreate-databases : Indicates if the test databases should be re-created}
+        {--drop-databases : Indicates if the test databases should be dropped}
     ';
 
     /**
@@ -238,7 +239,8 @@ protected function paratestArguments($options)
                 && !Str::startsWith($option, '--min')
                 && !Str::startsWith($option, '-p')
                 && !Str::startsWith($option, '--parallel')
-                && !Str::startsWith($option, '--recreate-databases');
+                && !Str::startsWith($option, '--recreate-databases')
+                && !Str::startsWith($option, '--drop-databases');
         }));
 
         if (!file_exists($file = base_path('phpunit.xml'))) {
@@ -271,6 +273,7 @@ protected function paratestEnvironmentVariables()
         return [
             'LARAVEL_PARALLEL_TESTING'                    => 1,
             'LARAVEL_PARALLEL_TESTING_RECREATE_DATABASES' => $this->option('recreate-databases'),
+            'LARAVEL_PARALLEL_TESTING_DROP_DATABASES' => $this->option('drop-databases'),
         ];
     }
 

diff --git a/tests/LaravelApp/app/Console/Commands/TestCommand.php b/tests/LaravelApp/app/Console/Commands/TestCommand.php
@@ -20,6 +20,7 @@ class TestCommand extends BaseTestCommand
         {--min= : Indicates the minimum threshold enforcement for coverage}
         {--p|parallel : Indicates if the tests should run in parallel}
         {--recreate-databases : Indicates if the test databases should be re-created}
+        {--drop-databases : Indicates if the test databases should be dropped}
         {--c|custom-argument : Add custom env variables}
 ';
 

diff --git a/tests/Unit/Adapters/ArtisanTestCommandTest.php b/tests/Unit/Adapters/ArtisanTestCommandTest.php
@@ -61,6 +61,7 @@ public function testEnv(): void
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--group', 'environment']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--group', 'environment']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--recreate-databases', '--group', 'environment']);
+        $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--drop-databases', '--group', 'environment']);
     }
 
     /** @test */
@@ -83,6 +84,7 @@ public function testEnvTesting(): void
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--group', 'environmentTesting']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--group', 'environmentTesting']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--recreate-databases', '--group', 'environmentTesting']);
+        $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--drop-databases', '--group', 'environmentTesting']);
     }
 
     /**
@@ -108,16 +110,19 @@ public function testExtendableCustomVariables(): void
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--group', 'environmentNoCVPhpunit']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--group', 'environmentNoCVParallel']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--recreate-databases', '--group', 'environmentNoCVParallelRecreate']);
+        $this->runTests(['./tests/LaravelApp/artisan', 'test', '--parallel', '--drop-databases', '--group', 'environmentNoCVParallelRecreate']);
 
         // With Custom Variables (-c)
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '-c', '--group', 'environmentCVPhpunit']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '-c', '--parallel', '--group', 'environmentCVParallel']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '-c', '--parallel', '--recreate-databases', '--group', 'environmentCVParallelRecreate']);
+        $this->runTests(['./tests/LaravelApp/artisan', 'test', '-c', '--parallel', '--drop-databases', '--group', 'environmentCVParallelRecreate']);
 
         // With Custom Variables (--custom-argument)
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--custom-argument', '--group', 'environmentCVPhpunit']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--custom-argument', '--parallel', '--group', 'environmentCVParallel']);
         $this->runTests(['./tests/LaravelApp/artisan', 'test', '--custom-argument', '--parallel', '--recreate-databases', '--group', 'environmentCVParallelRecreate']);
+        $this->runTests(['./tests/LaravelApp/artisan', 'test', '--custom-argument', '--parallel', '--drop-databases', '--group', 'environmentCVParallelRecreate']);
     }
 
     private function runTests(array $arguments, int $expectedExitCode = 0): string