aboutsummaryrefslogtreecommitdiffstats
path: root/tests/test_framework
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-06 21:51:13 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-06 21:51:13 +0200
commit9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd (patch)
treec2d5b1d3404770098a266ef4a5b9cb6cefd9b5d8 /tests/test_framework
parente419c2cd3b4f6eb24bb1011d326e1aef01a5c25b (diff)
parentd6735273319f26a75bb05fa601b92e1dff43b12d (diff)
downloadforums-9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd.tar
forums-9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd.tar.gz
forums-9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd.tar.bz2
forums-9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd.tar.xz
forums-9e90b27ba19fc2972b368c78e89bbc3bcaa3f9fd.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'tests/test_framework')
-rw-r--r--tests/test_framework/phpbb_ui_test_case.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index 914de2e02a..7ebcad38f8 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -74,12 +74,12 @@ class phpbb_ui_test_case extends phpbb_test_case
}
try {
- $capabilities = DesiredCapabilities::firefox();
+ $capabilities = DesiredCapabilities::chrome();
self::$webDriver = RemoteWebDriver::create(
self::$host . ':' . self::$port,
$capabilities,
- 60 * 1000, // 60 seconds connection timeout
- 60 * 1000 // 60 seconds request timeout
+ 30 * 1000, // 30 seconds connection timeout
+ 30 * 1000 // 30 seconds request timeout
);
} catch (WebDriverCurlException $e) {
self::markTestSkipped('PhantomJS webserver is not running.');