Fix browser tests regression

3 files changed, 7 insertions, 10 deletions

diff --git a/.github/config-test.inc.php b/.github/config-test.inc.php
index 4663fe380..d79b472ba 100644
--- a/.github/config-test.inc.php
+++ b/.github/config-test.inc.php
@@ -9,9 +9,6 @@ $config['db_dsnw'] = 'sqlite:////tmp/sqlite.db?mode=0646';
 $config['tests_username'] = 'test';
 $config['tests_password'] = 'test';
 
-// GreenMail
-$config['smtp_port'] = 25;
-
 // Settings required by the tests
 
 $config['create_default_folders'] = true;
diff --git a/.github/run.sh b/.github/run.sh
index 35720e4d0..6a16b2b53 100755
--- a/.github/run.sh
+++ b/.github/run.sh
@@ -30,7 +30,7 @@ wget https://repo1.maven.org/maven2/com/icegreen/greenmail-standalone/$GMV/green
     && sleep 10
 
 # Run tests
-echo "\nTESTS_MODE: DESKTOP" \
+echo "TESTS_MODE: DESKTOP" \
 && TESTS_MODE=desktop vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga \
 && echo "TESTS_MODE: PHONE" \
 && TESTS_MODE=phone vendor/bin/phpunit -c tests/Browser/phpunit.xml --exclude-group=failsonga-phone \
diff --git a/tests/Browser/bootstrap.php b/tests/Browser/bootstrap.php
index 54114991a..8bbe6ae5b 100644
--- a/tests/Browser/bootstrap.php
+++ b/tests/Browser/bootstrap.php
@@ -153,15 +153,15 @@ class bootstrap
         }
 
         $imap_host = $rcmail->config->get('imap_host');
+        $imap_port = 143;
+        $imap_ssl = false;
+
         $a_host = parse_url($imap_host);
+
         if (!empty($a_host['host'])) {
             $imap_host = $a_host['host'];
-            $imap_ssl  = isset($a_host['scheme']) && in_array($a_host['scheme'], ['ssl','imaps','tls']);
-            $imap_port = $a_host['port'] ?? ($imap_ssl ? 993 : 143);
-        }
-        else {
-            $imap_port = 143;
-            $imap_ssl = false;
+            $imap_ssl  = isset($a_host['scheme']) && in_array($a_host['scheme'], ['ssl','imaps','tls']) ? $a_host['scheme'] : false;
+            $imap_port = $a_host['port'] ?? ($imap_ssl && $imap_ssl != 'tls' ? 993 : 143);
         }
 
         if (!$imap->connect($imap_host, $username, $password, $imap_port, $imap_ssl)) {