Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-13 11:37:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix browser tests regression

Browse Source
This commit is contained in:
Aleksander Machniak
2021-12-07 15:22:20 +01:00
parent 893216cb29
commit fd39eecb48
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/config-test.inc.php vendored
View File

@@ -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;

2
.github/run.sh vendored
View File

@@ -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 \

12
tests/Browser/bootstrap.php
View File

@@ -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)) {