gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move defining envs to defineTestingGlobals

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-05-21 13:35:25 +02:00
parent fe32a359dc
commit 3a49cb33bb
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/bootstrap-dist.php
View File

@ -41,34 +41,6 @@ if (! defined('PHPMYADMIN')) {
}
// phpcs:enable
// Selenium tests setup
$test_defaults = [
'TESTSUITE_SERVER' => 'localhost',
'TESTSUITE_USER' => 'root',
'TESTSUITE_PASSWORD' => '',
'TESTSUITE_DATABASE' => 'test',
'TESTSUITE_PORT' => 3306,
'TESTSUITE_URL' => 'http://localhost/phpmyadmin/',
'TESTSUITE_SELENIUM_HOST' => '',
'TESTSUITE_SELENIUM_PORT' => '4444',
'TESTSUITE_SELENIUM_BROWSER' => 'firefox',
'TESTSUITE_SELENIUM_COVERAGE' => '',
'TESTSUITE_BROWSERSTACK_USER' => '',
'TESTSUITE_BROWSERSTACK_KEY' => '',
'TESTSUITE_FULL' => '',
'CI_MODE' => '',
];
if (PHP_SAPI == 'cli') {
foreach ($test_defaults as $varname => $defvalue) {
$envvar = getenv($varname);
if ($envvar) {
$GLOBALS[$varname] = $envvar;
} else {
$GLOBALS[$varname] = $defvalue;
}
}
}
require_once ROOT_PATH . 'libraries/vendor_config.php';
require_once AUTOLOAD_FILE;
Loader::loadFunctions();

31
test/classes/AbstractTestCase.php
View File

@ -137,6 +137,37 @@ abstract class AbstractTestCase extends TestCase
// phpcs:enable
}
public static function defineTestingGlobals(): void
{
// Selenium tests setup
$test_defaults = [
'TESTSUITE_SERVER' => 'localhost',
'TESTSUITE_USER' => 'root',
'TESTSUITE_PASSWORD' => '',
'TESTSUITE_DATABASE' => 'test',
'TESTSUITE_PORT' => 3306,
'TESTSUITE_URL' => 'http://localhost/phpmyadmin/',
'TESTSUITE_SELENIUM_HOST' => '',
'TESTSUITE_SELENIUM_PORT' => '4444',
'TESTSUITE_SELENIUM_BROWSER' => 'firefox',
'TESTSUITE_SELENIUM_COVERAGE' => '',
'TESTSUITE_BROWSERSTACK_USER' => '',
'TESTSUITE_BROWSERSTACK_KEY' => '',
'TESTSUITE_FULL' => '',
'CI_MODE' => '',
];
if (PHP_SAPI == 'cli') {
foreach ($test_defaults as $varname => $defvalue) {
$envvar = getenv($varname);
if ($envvar) {
$GLOBALS[$varname] = $envvar;
} else {
$GLOBALS[$varname] = $defvalue;
}
}
}
}
/**
* Desctroys the environment built for the test.
* Clean all variables

1
test/classes/EnvironmentTest.php
View File

@ -39,6 +39,7 @@ class EnvironmentTest extends AbstractTestCase
*/
public function testMySQL()
{
AbstractTestCase::defineTestingGlobals();
try {
$pdo = new PDO(
'mysql:host=' . $GLOBALS['TESTSUITE_SERVER'] . ';port=' . $GLOBALS['TESTSUITE_PORT'],

2
test/selenium/TestBase.php
View File

@ -21,6 +21,7 @@ use Facebook\WebDriver\WebDriverSelect;
use InvalidArgumentException;
use mysqli;
use mysqli_result;
use PhpMyAdmin\Tests\AbstractTestCase;
use PHPUnit\Framework\TestCase;
use Throwable;
use const CURLOPT_CUSTOMREQUEST;
@ -93,6 +94,7 @@ abstract class TestBase extends TestCase
*/
protected function setUp(): void
{
AbstractTestCase::defineTestingGlobals();
/**
* Needs to be implemented
*