Move defining envs to defineTestingGlobals

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 21, 2020 · 3a49cb3 · 3a49cb3
1 parent fe32a35
commit 3a49cb3
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
@@ -41,34 +41,6 @@
 }
 // 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();

diff --git a/test/classes/AbstractTestCase.php b/test/classes/AbstractTestCase.php
@@ -137,6 +137,37 @@ protected function defineVersionConstants(): void
         // 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

diff --git a/test/classes/EnvironmentTest.php b/test/classes/EnvironmentTest.php
@@ -39,6 +39,7 @@ public function testPhpVersion()
      */
     public function testMySQL()
     {
+        AbstractTestCase::defineTestingGlobals();
         try {
             $pdo = new PDO(
                 'mysql:host=' . $GLOBALS['TESTSUITE_SERVER'] . ';port=' . $GLOBALS['TESTSUITE_PORT'],

diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
@@ -21,6 +21,7 @@
 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
          *