Resolve tests

cakephp · Oct 30, 2019 · 78bc739 · 78bc739
1 parent 6221969
commit 78bc739
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -27,26 +27,16 @@
 	<php>
 		<!-- SQLite
 		<env name="db_class" value="Cake\Database\Driver\Sqlite"/>
-		<env name="db_dsn" value="sqlite::memory:"/>
+		<env name="db_dsn" value="sqlite:///:memory:"/>
 		-->
 		<!-- Postgres
-		<env name="db_class" value="Cake\Database\Driver\Postgres"/>
-		<env name="db_database" value="cake_test"/>
-		<env name="db_login" value=""/>
-		<env name="db_password" value=""/>
+		<env name="db_dsn" value="postgres://localhost/cake_test?timezone=UTC"/>
 		-->
 		<!-- Mysql
-		<env name="db_class" value="Cake\Database\Driver\Mysql"/>
-		<env name="db_dsn" value="mysql:host=localhost;dbname=cake_test"/>
-		<env name="db_database" value=""/>
-		<env name="db_login" value=""/>
-		<env name="db_password" value=""/>
+		<env name="db_dsn" value="mysql://localhost/cake_test?timezone=UTC"/>
 		-->
 		<!-- SQL Server
-		<env name="db_class" value="Cake\Database\Driver\Sqlserver"/>
-		<env name="db_dsn" value="sqlsrv:Server=localhost;Database=cake_test;MultipleActiveResultSets=false"/>
-		<env name="db_login" value=""/>
-		<env name="db_password" value=""/>
+		<env name="db_dsn" value="sqlserver://localhost/cake_test?timezone=UTC"/>
 		-->
 	</php>
     <filter>

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -104,16 +104,8 @@
     putenv('db_dsn=sqlite:///:memory:');
 }
 
-ConnectionManager::setConfig('test', [
-    'className' => 'Cake\Database\Connection',
-    'driver' => getenv('db_class'),
-    'dsn' => getenv('db_dsn'),
-    'database' => getenv('db_database'),
-    'username' => getenv('db_login'),
-    'password' => getenv('db_password'),
-    'timezone' => 'UTC',
-    'quoteIdentifiers' => getenv('quoteIdentifiers'),
-]);
+ConnectionManager::setConfig('test', ['url' => getenv('db_dsn')]);
+ConnectionManager::setConfig('test_custom_i18n_datasource', ['url' => getenv('db_dsn')]);
 
 Configure::write('Session', [
     'defaults' => 'php'