oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

Replace dbname suffix by explicit test database names

Browse source
This commit is contained in:
Yassine Guedidi 2025-02-18 00:50:08 +01:00
parent cbd37b2fe2
commit 163c3773cb
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.env.test Normal file
View file

@ -0,0 +1,3 @@
DATABASE_URL=sqlite:///%kernel.project_dir%/data/db/wallabag_test.sqlite?charset=utf8
#DATABASE_URL=mysql://root:wallaroot@mariadb:3306/wallabag_test?charset=utf8mb4
#DATABASE_URL=postgres://wallabag:wallapass@postgres:5432/wallabag_test?charset=utf8

2
app/config/config_test.yml
View file

@ -4,7 +4,6 @@ imports:
parameters: parameters:
fosuser_registration: true fosuser_registration: true
wallabag_dbname_suffix: '_test'
database_url: '%env(resolve:DATABASE_URL)%' database_url: '%env(resolve:DATABASE_URL)%'
domain_name: '%env(DOMAIN_NAME)%' domain_name: '%env(DOMAIN_NAME)%'
@ -25,7 +24,6 @@ web_profiler:
doctrine: doctrine:
dbal: dbal:
dbname_suffix: '%wallabag_dbname_suffix%' # for MySQL and PostgreSQL
use_savepoints: true use_savepoints: true
orm: orm:

2
app/config/tests/.env.sqlite
View file

@ -1 +1 @@
DATABASE_URL=sqlite:///%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite?charset=utf8 DATABASE_URL=sqlite:///%kernel.project_dir%/data/db/wallabag.sqlite?charset=utf8

21
tests/Command/InstallCommandTest.php
View file

@ -41,11 +41,18 @@ class InstallCommandTest extends WallabagTestCase
$connection = $this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection(); $connection = $this->getTestClient()->getContainer()->get(ManagerRegistry::class)->getConnection();
$this->originalDatabaseUrl = $this->getTestClient()->getContainer()->getParameter('database_url'); $this->originalDatabaseUrl = $this->getTestClient()->getContainer()->getParameter('database_url');
$dbnameSuffix = $this->getTestClient()->getContainer()->getParameter('wallabag_dbname_suffix'); $tmpDatabaseName = 'wallabag_test_' . bin2hex(random_bytes(5));
$tmpDatabaseName = 'wallabag_' . bin2hex(random_bytes(5));
if ($connection->getDatabasePlatform() instanceof SqlitePlatform) { if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {
$tmpDatabaseUrl = str_replace('wallabag' . $dbnameSuffix . '.sqlite', $tmpDatabaseName . $dbnameSuffix . '.sqlite', $this->originalDatabaseUrl); $tmpDatabaseName = $this->getTestClient()->getContainer()->getParameter('kernel.project_dir') . '/data/db/' . $tmpDatabaseName . '.sqlite';
/** @see \Doctrine\DBAL\Tools\DsnParser::parse */
$url = preg_replace('#^((?:pdo-)?sqlite3?):///#', '$1://localhost/', $this->originalDatabaseUrl);
$tmpDatabaseUrl = (string) (new Uri($url))->withPath($tmpDatabaseName);
// Add back the leading "/" that was removed by withPath, and remove the "localhost" part
$tmpDatabaseUrl = str_replace('//localhost', '///', $tmpDatabaseUrl);
} else { } else {
$tmpDatabaseUrl = (string) (new Uri($this->originalDatabaseUrl))->withPath($tmpDatabaseName); $tmpDatabaseUrl = (string) (new Uri($this->originalDatabaseUrl))->withPath($tmpDatabaseName);
} }
@ -54,8 +61,7 @@ class InstallCommandTest extends WallabagTestCase
if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) { if ($connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
// PostgreSQL requires that the database exists before connecting to it // PostgreSQL requires that the database exists before connecting to it
$tmpTestDatabaseName = $tmpDatabaseName . $dbnameSuffix; $connection->executeQuery('CREATE DATABASE ' . $tmpDatabaseName);
$connection->executeQuery('CREATE DATABASE ' . $tmpTestDatabaseName);
} }
// The environnement has been changed, recreate the client in order to update connection // The environnement has been changed, recreate the client in order to update connection
@ -72,7 +78,10 @@ class InstallCommandTest extends WallabagTestCase
if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {// Remove the real environnement variable if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {// Remove the real environnement variable
$_ENV['DATABASE_URL'] = $_SERVER['DATABASE_URL'] = $this->originalDatabaseUrl; $_ENV['DATABASE_URL'] = $_SERVER['DATABASE_URL'] = $this->originalDatabaseUrl;
$databasePath = parse_url($databaseUrl, \PHP_URL_PATH); /** @see \Doctrine\DBAL\Tools\DsnParser::parse */
$url = preg_replace('#^((?:pdo-)?sqlite3?):///#', '$1://localhost/', $databaseUrl);
$databasePath = parse_url($url, \PHP_URL_PATH);
if (file_exists($databasePath)) { if (file_exists($databasePath)) {
unlink($databasePath); unlink($databasePath);