Merge pull request #512 from magento/MQE-1520

MQE-1520: Consolidate WAIT_TIMEOUT in .env and pageload_timeout

Author: jilu1

dev/tests/_bootstrap.php

@@ -45,7 +45,8 @@
     'MAGENTO_BACKEND_NAME' => 'admin',
     'MAGENTO_ADMIN_USERNAME' => 'admin',
     'MAGENTO_ADMIN_PASSWORD' => 'admin123',
-    'DEFAULT_TIMEZONE' => 'America/Los_Angeles'
+    'DEFAULT_TIMEZONE' => 'America/Los_Angeles',
+    'WAIT_TIMEOUT' => '10'
 ];
 
 foreach ($TEST_ENVS as $key => $value) {

dev/tests/functional/standalone_bootstrap.php

@@ -49,7 +49,10 @@
 
     defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
-    
+
+    defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);
     } catch (\Exception $e) {

docs/configuration.md

@@ -295,6 +295,14 @@ Denoted in browser log entry as `"SOURCE": "type"`.
 BROWSER_LOG_BLACKLIST=other,console-api
 ```
 
+### WAIT_TIMEOUT
+
+Global MFTF configuration for the default amount of time (in seconds) that a test will wait while loading a page.
+
+```conf
+WAIT_TIMEOUT=30
+```
+
 <!-- Link definitions -->
 
 [`MAGENTO_CLI_COMMAND_PATH`]: #magento_cli_command_path

etc/config/.env.example

@@ -53,7 +53,7 @@ MODULE_WHITELIST=Magento_Framework,ConfigurableProductWishlist,ConfigurableProdu
 #ALLOW_SKIPPED=true
 
 #*** Default timeout for wait actions
-#WAIT_TIMEOUT=10
+#WAIT_TIMEOUT=30
 
 #*** Uncomment and set to enable browser log entries on actions in Allure. Blacklist is used to filter logs of a specific "source"
 #ENABLE_BROWSER_LOG=true

etc/config/functional.suite.dist.yml

@@ -27,7 +27,7 @@ modules:
             window_size: 1280x1024
             username: "%MAGENTO_ADMIN_USERNAME%"
             password: "%MAGENTO_ADMIN_PASSWORD%"
-            pageload_timeout: 30
+            pageload_timeout: "%WAIT_TIMEOUT%"
             host: "%SELENIUM_HOST%"
             port: "%SELENIUM_PORT%"
             protocol: "%SELENIUM_PROTOCOL%"

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

@@ -71,7 +71,6 @@ class ActionObject
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
     const STRING_PARAMETER_REGEX = "/'[^']+'/";
-    const DEFAULT_WAIT_TIMEOUT = 10;
     const ACTION_ATTRIBUTE_USERINPUT = 'userInput';
     const ACTION_TYPE_COMMENT = 'comment';
 
@@ -167,7 +166,7 @@ public function __construct(
      */
     public static function getDefaultWaitTimeout()
     {
-        return getenv('WAIT_TIMEOUT') ?: self::DEFAULT_WAIT_TIMEOUT;
+        return getenv('WAIT_TIMEOUT');
     }
 
     /**

src/Magento/FunctionalTestingFramework/_bootstrap.php

@@ -50,6 +50,9 @@
     defined('DEFAULT_TIMEZONE') || define('DEFAULT_TIMEZONE', 'America/Los_Angeles');
     $env->setEnvironmentVariable('DEFAULT_TIMEZONE', DEFAULT_TIMEZONE);
 
+    defined('WAIT_TIMEOUT') || define('WAIT_TIMEOUT', 30);
+    $env->setEnvironmentVariable('WAIT_TIMEOUT', 30);
+
     try {
         new DateTimeZone(DEFAULT_TIMEZONE);
     } catch (\Exception $e) {