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 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 ) {
Original file line number Diff line number Diff 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%"
Original file line number Diff line number Diff 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 /**
Original file line number Diff line number Diff line change 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 ) {
You can’t perform that action at this time.
0 commit comments