Skip to content

Commit ad1f42c

Browse files
committed
add fix
1 parent 6089254 commit ad1f42c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

tests/_support/Config/Registrar.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ public static function Database(): array
134134

135135
// Under GitHub Actions, we can set an ENV var named 'DB'
136136
// so that we can test against multiple databases.
137-
if (($group = getenv('DB')) && isset(self::$dbConfig[$group])) {
138-
$config['tests'] = self::$dbConfig[$group];
139-
}
137+
$group = env('DB', 'SQLite3');
138+
139+
$config['tests'] = self::$dbConfig[$group] ?? [];
140140

141141
return $config;
142142
}

tests/system/Commands/Database/MigrateStatusTest.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
use CodeIgniter\CLI\CLI;
1717
use CodeIgniter\Test\CIUnitTestCase;
18+
use CodeIgniter\Test\DatabaseTestTrait;
1819
use CodeIgniter\Test\StreamFilterTrait;
1920
use Config\Database;
2021
use PHPUnit\Framework\Attributes\Group;
@@ -26,17 +27,18 @@
2627
final class MigrateStatusTest extends CIUnitTestCase
2728
{
2829
use StreamFilterTrait;
30+
use DatabaseTestTrait;
2931

3032
private string $migrationFileFrom = SUPPORTPATH . 'MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php';
3133
private string $migrationFileTo = APPPATH . 'Database/Migrations/2018-01-24-102301_Some_migration.php';
3234

3335
protected function setUp(): void
3436
{
35-
$forge = Database::forge();
36-
$forge->dropTable('foo', true);
37-
3837
parent::setUp();
3938

39+
Database::connect()->table('migrations')->emptyTable();
40+
Database::forge()->dropTable('foo', true);
41+
4042
if (! is_file($this->migrationFileFrom)) {
4143
$this->fail(clean_path($this->migrationFileFrom) . ' is not found.');
4244
}
@@ -63,8 +65,7 @@ protected function tearDown(): void
6365
{
6466
parent::tearDown();
6567

66-
$db = db_connect();
67-
$db->table('migrations')->emptyTable();
68+
Database::connect()->table('migrations')->emptyTable();
6869

6970
if (is_file($this->migrationFileTo)) {
7071
@unlink($this->migrationFileTo);

0 commit comments

Comments
 (0)