浏览代码

Fix up test harness

mscherer 2 年之前
父节点
当前提交
3484b7dde2
共有 1 个文件被更改,包括 4 次插入10 次删除
  1. 4 10
      tests/bootstrap.php

+ 4 - 10
tests/bootstrap.php

@@ -126,9 +126,9 @@ class_alias(AppController::class, 'App\Controller\AppController');
 
 Plugin::getCollection()->add(new ToolsPlugin());
 
-if (getenv('db_dsn')) {
+if (getenv('DB_URL')) {
 	ConnectionManager::setConfig('test', [
-		'url' => getenv('db_dsn'),
+		'url' => getenv('DB_URL'),
 		'timezone' => 'UTC',
 		'quoteIdentifiers' => true,
 		'cacheMetadata' => true,
@@ -138,18 +138,12 @@ if (getenv('db_dsn')) {
 }
 
 // Ensure default test connection is defined
-if (!getenv('db_class')) {
+if (!getenv('DB_URL')) {
 	putenv('db_dsn=sqlite:///:memory:');
-
-	//putenv('db_dsn=postgres://postgres@127.0.0.1/test');
 }
 
 ConnectionManager::setConfig('test', [
-	'url' => getenv('db_dsn') ?: null,
-	'driver' => getenv('db_class') ?: null,
-	'database' => getenv('db_database') ?: null,
-	'username' => getenv('db_username') ?: null,
-	'password' => getenv('db_password') ?: null,
+	'url' => getenv('DB_URL') ?: null,
 	'timezone' => 'UTC',
 	'quoteIdentifiers' => true,
 	'cacheMetadata' => true,