Skip to content

Commit be71f94

Browse files
committed
MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout in config
- changed functional.suite.dist to use wait timeout - added default setters in bootstrap files (will always be defined) - removed default in actionObject
1 parent f101b0e commit be71f94

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

dev/tests/functional/standalone_bootstrap.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@
4949

5050
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
5151
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
52-
52+
53+
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10);
54+
$env->setEnvironmentVariable('WAIT_TIMEOUT', 10);
55+
5356
try {
5457
new DateTimeZone(DEFAULT_TIMEZONE);
5558
} catch (\Exception $e) {

etc/config/functional.suite.dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ modules:
2727
window_size: 1280x1024
2828
username: "%MAGENTO_ADMIN_USERNAME%"
2929
password: "%MAGENTO_ADMIN_PASSWORD%"
30-
pageload_timeout: 30
30+
pageload_timeout: "%WAIT_TIMEOUT%"
3131
host: "%SELENIUM_HOST%"
3232
port: "%SELENIUM_PORT%"
3333
protocol: "%SELENIUM_PROTOCOL%"

src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class ActionObject
7171
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
7272
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
7373
const STRING_PARAMETER_REGEX = "/'[^']+'/";
74-
const DEFAULT_WAIT_TIMEOUT = 10;
7574
const ACTION_ATTRIBUTE_USERINPUT = 'userInput';
7675
const ACTION_TYPE_COMMENT = 'comment';
7776

@@ -167,7 +166,7 @@ public function __construct(
167166
*/
168167
public static function getDefaultWaitTimeout()
169168
{
170-
return getenv('WAIT_TIMEOUT') ?: self::DEFAULT_WAIT_TIMEOUT;
169+
return getenv('WAIT_TIMEOUT');
171170
}
172171

173172
/**

src/Magento/FunctionalTestingFramework/_bootstrap.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
5151
$env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
5252

53+
defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 10);
54+
$env->setEnvironmentVariable('WAIT_TIMEOUT', 10);
55+
5356
try {
5457
new DateTimeZone(DEFAULT_TIMEZONE);
5558
} catch (\Exception $e) {

0 commit comments

Comments
 (0)