diff --git a/test/SP/Services/Install/DbTestUtilTrait.php b/test/SP/Services/Install/DbTestUtilTrait.php index deb9e259..5a7ba622 100644 --- a/test/SP/Services/Install/DbTestUtilTrait.php +++ b/test/SP/Services/Install/DbTestUtilTrait.php @@ -52,9 +52,9 @@ trait DbTestUtilTrait private function getConnection() { $data = (new DatabaseConnectionData()) - ->setDbHost('syspass-db') - ->setDbUser('root') - ->setDbPass('syspass'); + ->setDbHost(getenv('DB_SERVER')) + ->setDbUser(getenv('DB_USER')) + ->setDbPass(getenv('DB_PASS')); return (new MySQLHandler($data))->getConnectionSimple(); } diff --git a/test/SP/Services/Install/InstallerTest.php b/test/SP/Services/Install/InstallerTest.php index 095e2193..34641271 100644 --- a/test/SP/Services/Install/InstallerTest.php +++ b/test/SP/Services/Install/InstallerTest.php @@ -87,10 +87,10 @@ class InstallerTest extends TestCase public function testRun() { $params = new InstallData(); - $params->setDbAdminUser('root'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminUser(getenv('DB_USER')); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db'); + $params->setDbHost(getenv('DB_SERVER')); $params->setAdminLogin('admin'); $params->setAdminPass('syspass_admin'); $params->setMasterPassword('00123456789'); @@ -125,8 +125,8 @@ class InstallerTest extends TestCase public function testFailDbHostName() { $params = new InstallData(); - $params->setDbAdminUser('root'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminUser(getenv('DB_USER')); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); $params->setDbHost('fail'); $params->setAdminLogin('admin'); @@ -152,8 +152,8 @@ class InstallerTest extends TestCase public function testFailDbHostIp() { $params = new InstallData(); - $params->setDbAdminUser('root'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminUser(getenv('DB_USER')); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); $params->setDbHost('192.168.0.1'); $params->setAdminLogin('admin'); @@ -179,10 +179,10 @@ class InstallerTest extends TestCase public function testFailDbHostPort() { $params = new InstallData(); - $params->setDbAdminUser('root'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminUser(getenv('DB_USER')); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db:3307'); + $params->setDbHost(getenv('DB_SERVER') . ':3307'); $params->setAdminLogin('admin'); $params->setAdminPass('syspass_admin'); $params->setMasterPassword('00123456789'); @@ -207,9 +207,9 @@ class InstallerTest extends TestCase { $params = new InstallData(); $params->setDbAdminUser('toor'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db'); + $params->setDbHost(getenv('DB_SERVER')); $params->setAdminLogin('admin'); $params->setAdminPass('syspass_admin'); $params->setMasterPassword('00123456789'); @@ -233,10 +233,10 @@ class InstallerTest extends TestCase public function testFailDbPass() { $params = new InstallData(); - $params->setDbAdminUser('root'); + $params->setDbAdminUser(getenv('DB_USER')); $params->setDbAdminPass('test'); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db'); + $params->setDbHost(getenv('DB_SERVER')); $params->setAdminLogin('admin'); $params->setAdminPass('syspass_admin'); $params->setMasterPassword('00123456789'); @@ -266,7 +266,7 @@ class InstallerTest extends TestCase $params->setDbAdminUser('syspass_user'); $params->setDbAdminPass('123456'); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db'); + $params->setDbHost(getenv('DB_SERVER')); $params->setAdminLogin('admin'); $params->setAdminPass('syspass_admin'); $params->setMasterPassword('00123456789'); diff --git a/test/SP/Services/Install/MySQLTest.php b/test/SP/Services/Install/MySQLTest.php index a833d37f..1b80d0b4 100644 --- a/test/SP/Services/Install/MySQLTest.php +++ b/test/SP/Services/Install/MySQLTest.php @@ -65,10 +65,10 @@ class MySQLTest extends TestCase private function getParams() { $params = new InstallData(); - $params->setDbAdminUser('root'); - $params->setDbAdminPass('syspass'); + $params->setDbAdminUser(getenv('DB_USER')); + $params->setDbAdminPass(getenv('DB_PASS')); $params->setDbName(self::DB_NAME); - $params->setDbHost('syspass-db'); + $params->setDbHost(getenv('DB_SERVER')); $params->setDbAuthHost(SELF_IP_ADDRESS); $params->setDbAuthHostDns(SELF_HOSTNAME); $params->setAdminLogin('admin');