Skip to content

Commit 06944e4

Browse files
committed
refactor: clean up testing database initialization
1 parent 20d3669 commit 06944e4

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

tests/Integration/FrameworkIntegrationTestCase.php

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use InvalidArgumentException;
88
use Stringable;
99
use Tempest\Database\DatabaseInitializer;
10-
use Tempest\Database\Migrations\MigrationManager;
1110
use Tempest\Discovery\DiscoveryLocation;
1211
use Tempest\Framework\Testing\IntegrationTest;
1312
use Tempest\Reflection\MethodReflector;
@@ -18,6 +17,8 @@
1817
use Tempest\Router\Routing\Construction\RouteConfigurator;
1918
use Tempest\Router\Static\StaticPageConfig;
2019
use Tempest\Router\StaticPage;
20+
use Tempest\Support\Filesystem;
21+
use Tempest\Support\Path;
2122
use Tempest\View\GenericView;
2223
use Tempest\View\View;
2324
use Tempest\View\ViewComponent;
@@ -40,20 +41,19 @@ protected function setUp(): void
4041
{
4142
parent::setUp();
4243

43-
// Database
4444
$this->container
4545
->removeInitializer(DatabaseInitializer::class)
4646
->addInitializer(TestingDatabaseInitializer::class);
4747

48-
$databaseConfigPath = __DIR__ . '/../Fixtures/Config/database.config.php';
48+
$defaultDatabaseConfigPath = Path\normalize(__DIR__, '..', 'Fixtures/Config/database.sqlite.php');
49+
$databaseConfigPath = Path\normalize(__DIR__, '..', 'Fixtures/Config/database.config.php');
4950

50-
if (! file_exists($databaseConfigPath)) {
51-
copy(__DIR__ . '/../Fixtures/Config/database.sqlite.php', $databaseConfigPath);
51+
if (! Filesystem\exists($databaseConfigPath)) {
52+
Filesystem\copy_file($defaultDatabaseConfigPath, $databaseConfigPath);
5253
}
5354

5455
$this->container->config(require $databaseConfigPath);
55-
56-
$this->rollbackDatabase();
56+
$this->database->reset(migrate: false);
5757
}
5858

5959
protected function render(string|View $view, mixed ...$params): string
@@ -79,13 +79,6 @@ protected function registerViewComponent(string $name, string $html, string $fil
7979
$this->container->get(ViewConfig::class)->addViewComponent($viewComponent);
8080
}
8181

82-
protected function rollbackDatabase(): void
83-
{
84-
$migrationManager = $this->container->get(MigrationManager::class);
85-
86-
$migrationManager->dropAll();
87-
}
88-
8982
protected function assertStringCount(string $subject, string $search, int $count): void
9083
{
9184
$this->assertSame($count, substr_count($subject, $search));

0 commit comments

Comments
 (0)