Fix server login and documentation

Signed-off-by: William Desportes <williamdes@wdes.fr>

.github/workflows/test-selenium.yml

@@ -21,9 +21,6 @@ jobs:
             ports:
               - "3306:3306"
             options: >-
-              --name database-server
-              --hostname database-server
-              --add-host database-server:127.0.0.1
               --health-cmd="mysqladmin ping"
               --health-interval=10s
               --health-timeout=5s
@@ -104,15 +101,15 @@ jobs:
                 CI_MODE: selenium
                 TESTSUITE_SELENIUM_BROWSER: chrome
                 TESTSUITE_USER: root
+                TESTSUITE_PASSWORD: testbench
                 # Port defined in test/nginx.conf
                 TESTSUITE_URL: http://docker-host-bridge:8000
-                TESTSUITE_SERVER: "database-server"
-                TESTSUITE_DATABASE: "selenium"
+                TESTSUITE_DATABASE_PREFIX: "selenium"
                 TESTSUITE_SELENIUM_HOST: "127.0.0.1"
                 TESTSUITE_SELENIUM_PORT: "4444"
               # Allowed errors: https://github.com/phpmyadmin/phpmyadmin/issues/16479
               continue-on-error: true
-              run: ./vendor/bin/phpunit --group selenium --verbose --debug
+              run: ./vendor/bin/phpunit --group selenium --verbose --debug --no-coverage
             - name: Output logs
               if: ${{ success() || failure() }}
               run: |
@@ -120,6 +117,7 @@ jobs:
                 if [ -f nginx-error.log ] ; then cat nginx-error.log ; fi
             - name: 'Upload screenshots'
               uses: actions/upload-artifact@v2
+              if: ${{ success() || failure() }}
               with:
                 name: selenium-screenshots
                 path: ${{ github.workspace }}/build/selenium/**/*

test/README.rst

@@ -47,10 +47,9 @@ TESTSUITE_BROWSERSTACK_KEY
 For example you can use following setup in ``phpunit.xml``::
 
     <php>
-        <env name="TESTSUITE_SERVER" value="localhost"/>
         <env name="TESTSUITE_USER" value="root"/>
         <env name="TESTSUITE_PASSWORD" value="root"/>
-        <env name="TESTSUITE_DATABASE" value="test"/>
+        <env name="TESTSUITE_DATABASE_PREFIX" value="test"/>
         <env name="TESTSUITE_URL" value="http://localhost/phpmyadmin/" />
         <env name="TESTSUITE_SELENIUM_HOST" value="127.0.0.1" />
         <env name="TESTSUITE_SELENIUM_PORT" value="4444" />

test/config.e2e.inc.php

@@ -6,5 +6,6 @@ $i = 0;
 $cfg['Servers'] = [];
 $i++;
 $cfg['Servers'][$i]['verbose'] = 'Local';
+$cfg['Servers'][$i]['host'] = '127.0.0.1';
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
 $cfg['UploadDir'] = './test/test_data/';

test/selenium/TestBase.php

@@ -626,6 +626,8 @@ abstract class TestBase extends TestCase
             $this->webDriver->switchTo()->window($this->sqlWindowHandle);
             if (! $this->isSuccessLogin()) {
                 $this->takeScrenshot('SQL_window_not_logged_in');
+
+                return false;
             }
             $this->byXPath('//*[contains(@class,"nav-item") and contains(., "SQL")]')->click();
             $this->waitAjax();