Add local file support for test configuration files

diff --git a/.gitignore b/.gitignore
index def648bb8813433517677dd9c3ba9130694c1e69..7be337d9ce6bd218b26bce505c717e44e73309c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,8 @@ quick_gen_project_*
 !/galette/config/config.inc.php.dist
 /galette/config/local_*
 /galette/config/behavior.inc.php
+/tests/config/mysql/local_config.inc.php
+/tests/config/pgsql/local_config.inc.php
 
 # /galette/data/exports/
 /galette/data/exports/*

diff --git a/tests/Galette/Core/tests/units/Install.php b/tests/Galette/Core/tests/units/Install.php
index 3feac2ff263e15e9bdc4b75debb84df4dd89426b..930d4399b8fd29b40e89766cddb840ab2dfaa456 100644 (file)
--- a/tests/Galette/Core/tests/units/Install.php
+++ b/tests/Galette/Core/tests/units/Install.php
@@ -310,7 +310,6 @@ class Install extends atoum
         $this->string($title)->isIdenticalTo('Database access and permissions');
 
         $connected = $this->_install->testDbConnexion();
-        var_dump($connected);
         $this->boolean($connected)->isTrue();
 
         $host = $this->_install->getDbHost();

diff --git a/tests/config/mysql/config.inc.php b/tests/config/mysql/config.inc.php
index d41a0824da84669263edc9246234b9478a6aae53..ddd064ceffc5e9bd88f42e2ceabde7ea4ab50c1d 100644 (file)
--- a/tests/config/mysql/config.inc.php
+++ b/tests/config/mysql/config.inc.php
@@ -1,8 +1,23 @@
 <?php
 define("TYPE_DB", "mysql");
-define("HOST_DB", "localhost");
-define("PORT_DB", "3306");
-define("USER_DB", "root");
-define("PWD_DB", "");
-define("NAME_DB", "galette_tests");
-define("PREFIX_DB", "galette_");
+if (file_exists(__DIR__ . '/local_config.inc.php')) {
+    include_once __DIR__ . '/local_config.inc.php';
+}
+if (!defined('HOST_DB')) {
+    define("HOST_DB", "localhost");
+}
+if (!defined('PORT_DB')) {
+    define("PORT_DB", "3306");
+}
+if (!defined('USER_DB')) {
+    define("USER_DB", "root");
+}
+if (!defined('PWD_DB')) {
+    define("PWD_DB", "");
+}
+if (!defined('NAME_DB')) {
+    define("NAME_DB", "galette_tests");
+}
+if (!defined('PREFIX_DB')) {
+    define("PREFIX_DB", "galette_");
+}

diff --git a/tests/config/pgsql/config.inc.php b/tests/config/pgsql/config.inc.php
index fb92a3e09fd5a9ef903ca4423b39439df6435c2d..ec61f58290e77dc3f54bda3b6aa8e42babde1263 100644 (file)
--- a/tests/config/pgsql/config.inc.php
+++ b/tests/config/pgsql/config.inc.php
@@ -1,8 +1,24 @@
 <?php
 define("TYPE_DB", "pgsql");
-define("HOST_DB", "localhost");
-define("PORT_DB", "5432");
-define("USER_DB", "postgres");
-define("PWD_DB", "");
-define("NAME_DB", "galette_tests");
-define("PREFIX_DB", "galette_");
+
+if (file_exists(__DIR__ . '/local_config.inc.php')) {
+    include_once __DIR__ . '/local_config.inc.php';
+}
+if (!defined('HOST_DB')) {
+    define("HOST_DB", "localhost");
+}
+if (!defined('PORT_DB')) {
+    define("PORT_DB", "5432");
+}
+if (!defined('USER_DB')) {
+    define("USER_DB", "postgres");
+}
+if (!defined('PWD_DB')) {
+    define("PWD_DB", "");
+}
+if (!defined('NAME_DB')) {
+    define("NAME_DB", "galette_tests");
+}
+if (!defined('PREFIX_DB')) {
+    define("PREFIX_DB", "galette_");
+}