Merge changes from CD-develop to develop

dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArguments.txt

@@ -27,6 +27,6 @@ class ActionGroupWithSectionAndDataAsArgumentsCest
 	 */
 	public function ActionGroupWithSectionAndDataAsArguments(AcceptanceTester $I)
 	{
-		$I->waitForElementVisible("#element .John");
+		$I->waitForElementVisible("#element .John", 10);
 	}
 }

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -126,7 +126,7 @@ class BasicFunctionalTestCest
 		$I->moveMouseOver(".functionalTestSelector");
 		$I->openNewTab();
 		$I->pauseExecution();
-		$I->performOn("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();});
+		$I->performOn("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();}, 10);
 		$I->pressKey("#page", "a");
 		$I->pressKey("#page", ['ctrl', 'a'],'new');
 		$I->pressKey("#page", ['shift', '111'],'1','x');
@@ -165,7 +165,7 @@ class BasicFunctionalTestCest
 		$I->waitForElement(".functionalTestSelector", 30);
 		$I->waitForElementNotVisible(".functionalTestSelector", 30);
 		$I->waitForElementVisible(".functionalTestSelector", 30);
-		$I->waitForElementChange("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();});
+		$I->waitForElementChange("#selector", function(\WebDriverElement $el) {return $el->isDisplayed();}, 10);
 		$I->waitForJS("someJsFunction", 30);
 		$I->waitForText("someInput", 30, ".functionalTestSelector");
 	}

etc/config/.env.example

@@ -44,4 +44,7 @@ MODULE_WHITELIST=Magento_Framework,Magento_ConfigurableProductWishlist,Magento_C
 
 #*** Bool property which allows the user to toggle debug output during test execution
 #MFTF_DEBUG=
+
+#*** Default timeout for wait actions
+#WAIT_TIMEOUT=10
 #*** End of .env ***#

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

@@ -68,6 +68,7 @@ class ActionObject
     const ACTION_ATTRIBUTE_SELECTOR = 'selector';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PARAMETER = '/\(.+\)/';
     const ACTION_ATTRIBUTE_VARIABLE_REGEX_PATTERN = '/({{[\w]+\.[\w\[\]]+}})|({{[\w]+\.[\w]+\((?(?!}}).)+\)}})/';
+    const DEFAULT_WAIT_TIMEOUT = 10;
 
     /**
      * The unique identifier for the action
@@ -154,6 +155,16 @@ public function __construct(
         }
     }
 
+    /**
+     * Retrieve default timeout in seconds for 'wait*' actions
+     *
+     * @return integer
+     */
+    public static function getDefaultWaitTimeout()
+    {
+        return getenv('WAIT_TIMEOUT') ?: self::DEFAULT_WAIT_TIMEOUT;
+    }
+
     /**
      * This function returns the string property stepKey.
      *
@@ -271,7 +282,6 @@ public function resolveReferences()
      * Warns user if they are using old Assertion syntax.
      *
      * @return void
-     * @throws TestReferenceException
      */
     public function trimAssertionAttributes()
     {

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -595,6 +595,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
             if (isset($customActionAttributes['timeout'])) {
                 $time = $customActionAttributes['timeout'];
             }
+            $time = $time ?? ActionObject::getDefaultWaitTimeout();
 
             if (isset($customActionAttributes['parameterArray']) && $actionObject->getType() != 'pressKey') {
                 // validate the param array is in the correct format