test: fix Commands random-order failures

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

.github/scripts/random-tests-config.txt

@@ -13,7 +13,7 @@ AutoReview
 Autoloader
 # Cache
 CLI
-# Commands
+Commands
 # Config
 Cookie
 # DataCaster

system/Commands/Database/ShowTableInfo.php

@@ -243,7 +243,7 @@ private function makeTbodyForShowAllTables(array $tables): array
     {
         $this->removeDBPrefix();
 
-        foreach ($tables  as $id => $tableName) {
+        foreach (array_values($tables) as $id => $tableName) {
             $table = $this->db->protectIdentifiers($tableName);
             $db    = $this->db->query("SELECT * FROM {$table}");
 

tests/_support/Commands/Unsuffixable.php

@@ -76,4 +76,14 @@ public function run(array $params): void
         $this->setEnabledSuffixing(false);
         $this->generateClass($params);
     }
+
+    protected function prepare(string $class): string
+    {
+        return $this->parseTemplate(
+            $class,
+            ['{group}', '{command}'],
+            ['Generators', 'make:foo'],
+            ['type' => 'basic'],
+        );
+    }
 }

tests/system/Commands/Cache/ClearCacheTest.php

@@ -80,6 +80,7 @@ public function testClearCacheFails(): void
         Services::injectMock('cache', $cache);
 
         command('cache:clear');
+        Services::resetSingle('cache');
 
         $this->assertSame(
             "\nError while clearing the cache.\n",

tests/system/Commands/CreateDatabaseTest.php

@@ -35,7 +35,7 @@ final class CreateDatabaseTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        $this->connection = Database::connect();
+        $this->connection = Database::connect(null, false);
 
         parent::setUp();
 
@@ -54,12 +54,31 @@ private function dropDatabase(): void
         if ($this->connection instanceof SQLite3Connection) {
             $file = WRITEPATH . 'database.db';
 
+            $this->closeDatabaseConnections();
+
             if (is_file($file)) {
                 unlink($file);
             }
-        } elseif (Database::utils('tests')->databaseExists('database')) {
+
+            return;
+        }
+
+        if (Database::utils('tests')->databaseExists('database')) {
             Database::forge()->dropDatabase('database');
         }
+
+        $this->closeDatabaseConnections();
+    }
+
+    private function closeDatabaseConnections(): void
+    {
+        $this->connection->close();
+
+        foreach (Database::getConnections() as $connection) {
+            $connection->close();
+        }
+
+        $this->setPrivateProperty(Database::class, 'instances', []);
     }
 
     protected function getBuffer(): string

tests/system/Commands/Database/MigrateStatusTest.php

@@ -34,6 +34,8 @@ final class MigrateStatusTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
+        $this->resetServices();
+
         parent::setUp();
 
         Database::connect()->table('migrations')->emptyTable();
@@ -57,6 +59,8 @@ protected function setUp(): void
         );
         file_put_contents($this->migrationFileTo, $contents);
 
+        $this->resetServices();
+
         putenv('NO_COLOR=1');
         CLI::init();
     }
@@ -73,6 +77,8 @@ protected function tearDown(): void
 
         putenv('NO_COLOR');
         CLI::init();
+
+        $this->resetServices();
     }
 
     public function testMigrateAllWithWithTwoNamespaces(): void
@@ -82,19 +88,7 @@ public function testMigrateAllWithWithTwoNamespaces(): void
 
         command('migrate:status');
 
-        $result   = str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
-        $result   = preg_replace('/\d{4}-\d\d-\d\d \d\d:\d\d:\d\d/', 'YYYY-MM-DD HH:MM:SS', $result);
-        $expected = <<<'EOL'
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
-            | Namespace     | Version           | Filename           | Group | Migrated On         | Batch |
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
-            | App           | 2018-01-24-102301 | Some_migration     | tests | YYYY-MM-DD HH:MM:SS | 1     |
-            | Tests\Support | 20160428212500    | Create_test_tables | tests | YYYY-MM-DD HH:MM:SS | 1     |
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
-
-
-            EOL;
-        $this->assertSame($expected, $result);
+        $this->assertMigrationStatusHasAppAndSupportMigrations();
     }
 
     public function testMigrateWithWithTwoNamespaces(): void
@@ -105,18 +99,15 @@ public function testMigrateWithWithTwoNamespaces(): void
 
         command('migrate:status');
 
-        $result   = str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
-        $result   = preg_replace('/\d{4}-\d\d-\d\d \d\d:\d\d:\d\d/', 'YYYY-MM-DD HH:MM:SS', $result);
-        $expected = <<<'EOL'
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
-            | Namespace     | Version           | Filename           | Group | Migrated On         | Batch |
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
-            | App           | 2018-01-24-102301 | Some_migration     | tests | YYYY-MM-DD HH:MM:SS | 1     |
-            | Tests\Support | 20160428212500    | Create_test_tables | tests | YYYY-MM-DD HH:MM:SS | 2     |
-            +---------------+-------------------+--------------------+-------+---------------------+-------+
+        $this->assertMigrationStatusHasAppAndSupportMigrations();
+    }
 
+    private function assertMigrationStatusHasAppAndSupportMigrations(): void
+    {
+        $result = str_replace(PHP_EOL, "\n", $this->getStreamFilterBuffer());
 
-            EOL;
-        $this->assertSame($expected, $result);
+        $this->assertStringContainsString('| App           | 2018-01-24-102301 | Some_migration', $result);
+        $this->assertStringContainsString('| Tests\Support | 20160428212500', $result);
+        $this->assertStringContainsString('Create_test_tables', $result);
     }
 }

tests/system/Commands/Database/ShowTableInfoMockIOTest.php

@@ -17,6 +17,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\Mock\MockInputOutput;
+use Config\Database;
 use PHPUnit\Framework\Attributes\Group;
 
 /**
@@ -51,12 +52,16 @@ protected function tearDown(): void
 
     public function testDbTableWithInputs(): void
     {
+        $tableIndex = array_search('db_migrations', Database::connect()->listTables(), true);
+
+        $this->assertIsInt($tableIndex);
+
         // Set MockInputOutput to CLI.
         $io = new MockInputOutput();
         CLI::setInputOutput($io);
 
-        // User will input "a" (invalid value) and "0".
-        $io->setInputs(['a', '0']);
+        // User will input "a" (invalid value) and then select db_migrations.
+        $io->setInputs(['a', (string) $tableIndex]);
 
         command('db:table');
 
@@ -71,7 +76,7 @@ public function testDbTableWithInputs(): void
             $result,
         );
         $this->assertMatchesRegularExpression(
-            '/Which table do you want to see\? \[[\d,\s]+\]\: 0/',
+            '/Which table do you want to see\? \[[\d,\s]+\]\: ' . $tableIndex . '/',
             $result,
         );
         $this->assertMatchesRegularExpression(

tests/system/Commands/Database/ShowTableInfoTest.php

@@ -17,7 +17,6 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\StreamFilterTrait;
-use Config\Database;
 use PHPUnit\Framework\Attributes\Group;
 use Tests\Support\Database\Seeds\CITestSeeder;
 
@@ -30,7 +29,7 @@ final class ShowTableInfoTest extends CIUnitTestCase
     use DatabaseTestTrait;
     use StreamFilterTrait;
 
-    protected $migrateOnce = true;
+    protected $seed = CITestSeeder::class;
 
     protected function setUp(): void
     {
@@ -121,9 +120,6 @@ public function testDbTableMetadata(): void
 
     public function testDbTableDesc(): void
     {
-        $seeder = Database::seeder();
-        $seeder->call(CITestSeeder::class);
-
         command('db:table db_user --desc');
 
         $result = $this->getNormalizedResult();

tests/system/Commands/DatabaseCommandsTest.php

@@ -14,6 +14,7 @@
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\StreamFilterTrait;
 use PHPUnit\Framework\Attributes\Group;
 
@@ -25,6 +26,7 @@
 #[Group('DatabaseLive')]
 final class DatabaseCommandsTest extends CIUnitTestCase
 {
+    use DatabaseTestTrait;
     use StreamFilterTrait;
 
     protected function tearDown(): void

tests/system/Commands/Generators/ScaffoldGeneratorTest.php

@@ -35,6 +35,33 @@ protected function setUp(): void
         parent::setUp();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->removeGeneratedFiles();
+    }
+
+    private function removeGeneratedFiles(): void
+    {
+        preg_match_all('/File (?:created|overwritten): (APPPATH[^\r\n]+)/', $this->getStreamFilterBuffer(), $matches);
+
+        foreach ($matches[1] as $file) {
+            $path = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $file);
+
+            if (is_file($path)) {
+                @unlink($path);
+            }
+
+            $dir      = dirname($path);
+            $dirFiles = is_dir($dir) ? scandir($dir) : false;
+
+            if (str_starts_with($dir, APPPATH) && $dirFiles !== false && count($dirFiles) === 2) {
+                @rmdir($dir);
+            }
+        }
+    }
+
     protected function getFileContents(string $filepath): string
     {
         if (! is_file($filepath)) {