From 1910579791a633b2eef25707ff490a79c4fe7494 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 24 May 2020 13:25:12 +0200
Subject: Add getters for some ENVs in the selenium test suite

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 test/selenium/ChangePasswordTest.php |  6 +++---
 test/selenium/TestBase.php           | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/selenium/ChangePasswordTest.php b/test/selenium/ChangePasswordTest.php
index da5b2b9882..183fc3d986 100644
--- a/test/selenium/ChangePasswordTest.php
+++ b/test/selenium/ChangePasswordTest.php
@@ -64,13 +64,13 @@ class ChangePasswordTest extends TestBase
         $this->assertNotEquals('', $this->byName('pma_pw2')->getAttribute('value'));
         $this->assertNotEquals('', $this->byName('generated_pw')->getAttribute('value'));
 
-        if ($GLOBALS['TESTSUITE_PASSWORD'] != '') {
+        if ($this->getTestSuiteUserPassword() !== '') {
             $this->byName('pma_pw')->clear();
             $this->byName('pma_pw2')->clear();
 
-            $this->byName('pma_pw')->click()->sendKeys($GLOBALS['TESTSUITE_PASSWORD']);
+            $this->byName('pma_pw')->click()->sendKeys($this->getTestSuiteUserPassword());
 
-            $this->byName('pma_pw2')->click()->sendKeys($GLOBALS['TESTSUITE_PASSWORD']);
+            $this->byName('pma_pw2')->click()->sendKeys($this->getTestSuiteUserPassword());
         } else {
             $this->byId('nopass_1')->click();
         }
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 043d409d83..c6e20859e3 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -163,6 +163,23 @@ abstract class TestBase extends TestCase
         }
     }
 
+    private function getBrowserStackCredentials(): string
+    {
+        return getenv('TESTSUITE_BROWSERSTACK_USER') . ':' . getenv('TESTSUITE_BROWSERSTACK_KEY');
+    }
+
+    protected function getTestSuiteUserLogin(): string
+    {
+        $user = getenv('TESTSUITE_USER');
+        return $user === false ? '' : $user;
+    }
+
+    protected function getTestSuiteUserPassword(): string
+    {
+        $user = getenv('TESTSUITE_PASSWORD');
+        return $user === false ? '' : $user;
+    }
+
     /**
      * Has CI config ( CI_MODE == selenium )
      */
-- 
cgit v1.2.3