File tree Expand file tree Collapse file tree 4 files changed +9
-4
lines changed
src/Magento/FunctionalTestingFramework Expand file tree Collapse file tree 4 files changed +9
-4
lines changed Original file line number Diff line number Diff line change 49
49
50
50
defined ('DEFAULT_TIMEZONE ' ) || define ('DEFAULT_TIMEZONE ' , 'America/Los_Angeles ' );
51
51
$ env ->setEnvironmentVariable ('DEFAULT_TIMEZONE ' , DEFAULT_TIMEZONE );
52
-
52
+
53
+ defined ('WAIT_TIMEOUT ' ) || define ('WAIT_TIMEOUT ' , 10 );
54
+ $ env ->setEnvironmentVariable ('WAIT_TIMEOUT ' , 10 );
55
+
53
56
try {
54
57
new DateTimeZone (DEFAULT_TIMEZONE );
55
58
} catch (\Exception $ e ) {
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ modules:
27
27
window_size : 1280x1024
28
28
username : " %MAGENTO_ADMIN_USERNAME%"
29
29
password : " %MAGENTO_ADMIN_PASSWORD%"
30
- pageload_timeout : 30
30
+ pageload_timeout : " %WAIT_TIMEOUT% "
31
31
host : " %SELENIUM_HOST%"
32
32
port : " %SELENIUM_PORT%"
33
33
protocol : " %SELENIUM_PROTOCOL%"
Original file line number Diff line number Diff line change @@ -71,7 +71,6 @@ class ActionObject
71
71
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/ ' ;
72
72
const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/ ' ;
73
73
const STRING_PARAMETER_REGEX = "/'[^']+'/ " ;
74
- const DEFAULT_WAIT_TIMEOUT = 10 ;
75
74
const ACTION_ATTRIBUTE_USERINPUT = 'userInput ' ;
76
75
const ACTION_TYPE_COMMENT = 'comment ' ;
77
76
@@ -167,7 +166,7 @@ public function __construct(
167
166
*/
168
167
public static function getDefaultWaitTimeout ()
169
168
{
170
- return getenv ('WAIT_TIMEOUT ' ) ?: self :: DEFAULT_WAIT_TIMEOUT ;
169
+ return getenv ('WAIT_TIMEOUT ' );
171
170
}
172
171
173
172
/**
Original file line number Diff line number Diff line change 50
50
defined ('DEFAULT_TIMEZONE ' ) || define ('DEFAULT_TIMEZONE ' , 'America/Los_Angeles ' );
51
51
$ env ->setEnvironmentVariable ('DEFAULT_TIMEZONE ' , DEFAULT_TIMEZONE );
52
52
53
+ defined ('WAIT_TIMEOUT ' ) || define ('WAIT_TIMEOUT ' , 10 );
54
+ $ env ->setEnvironmentVariable ('WAIT_TIMEOUT ' , 10 );
55
+
53
56
try {
54
57
new DateTimeZone (DEFAULT_TIMEZONE );
55
58
} catch (\Exception $ e ) {
You can’t perform that action at this time.
0 commit comments