[8.x] Allow parallel testing without database creation (#38143)

* Allow parallel testing without database copying * Remove pointless wrap of optional recreate_databases * formatting' Co-authored-by: Taylor Otwell <[email protected]>
laravel · Jul 27, 2021 · 9d8bf0a · 9d8bf0a
1 parent 67b5182
commit 9d8bf0a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/src/Illuminate/Testing/Concerns/TestDatabases.php b/src/Illuminate/Testing/Concerns/TestDatabases.php
@@ -46,19 +46,21 @@ protected function bootTestDatabase()
             ];
 
             if (Arr::hasAny($uses, $databaseTraits)) {
-                $this->whenNotUsingInMemoryDatabase(function ($database) use ($uses) {
-                    [$testDatabase, $created] = $this->ensureTestDatabaseExists($database);
+                if (! ParallelTesting::option('without_databases')) {
+                    $this->whenNotUsingInMemoryDatabase(function ($database) use ($uses) {
+                        [$testDatabase, $created] = $this->ensureTestDatabaseExists($database);
 
-                    $this->switchToDatabase($testDatabase);
+                        $this->switchToDatabase($testDatabase);
 
-                    if (isset($uses[Testing\DatabaseTransactions::class])) {
-                        $this->ensureSchemaIsUpToDate();
-                    }
+                        if (isset($uses[Testing\DatabaseTransactions::class])) {
+                            $this->ensureSchemaIsUpToDate();
+                        }
 
-                    if ($created) {
-                        ParallelTesting::callSetUpTestDatabaseCallbacks($testDatabase);
-                    }
-                });
+                        if ($created) {
+                            ParallelTesting::callSetUpTestDatabaseCallbacks($testDatabase);
+                        }
+                    });
+                }
             }
         });
     }

diff --git a/tests/Testing/ParallelTestingTest.php b/tests/Testing/ParallelTestingTest.php
@@ -56,13 +56,21 @@ public function testOptions()
         $parallelTesting = new ParallelTesting(Container::getInstance());
 
         $this->assertFalse($parallelTesting->option('recreate_databases'));
+        $this->assertFalse($parallelTesting->option('without_databases'));
 
         $parallelTesting->resolveOptionsUsing(function ($option) {
             return $option === 'recreate_databases';
         });
 
         $this->assertFalse($parallelTesting->option('recreate_caches'));
+        $this->assertFalse($parallelTesting->option('without_databases'));
         $this->assertTrue($parallelTesting->option('recreate_databases'));
+
+        $parallelTesting->resolveOptionsUsing(function ($option) {
+            return $option === 'without_databases';
+        });
+
+        $this->assertTrue($parallelTesting->option('without_databases'));
     }
 
     public function testToken()