Merge branch 'develop' into getting-started-nginx-config

Author: jilu1

src/Magento/FunctionalTestingFramework/Module/MagentoPwaWebDriver.php

@@ -6,6 +6,8 @@
 
 namespace Magento\FunctionalTestingFramework\Module;
 
+use Codeception\Module\WebDriver;
+
 /**
  * Class MagentoPwaActions
  *
@@ -15,8 +17,24 @@
  */
 class MagentoPwaWebDriver extends MagentoWebDriver
 {
+    /**
+     * Go to the page.
+     *
+     * Overriding the MagentoWebDriver version because it contains 'waitForPageLoad'.
+     * The AJAX check in 'waitForPageLoad' does NOT work with a PWA.
+     *
+     * @param string $page
+     * @throws \Exception
+     * @return void
+     */
+    public function amOnPage($page)
+    {
+        WebDriver::amOnPage($page);
+    }
+
     /**
      * Wait for a PWA Element to NOT be visible using JavaScript.
+     * Add the WAIT_TIMEOUT variable to your .env file for this action.
      *
      * @param null $selector
      * @param null $timeout
@@ -25,8 +43,6 @@ class MagentoPwaWebDriver extends MagentoWebDriver
      */
     public function waitForPwaElementNotVisible($selector, $timeout = null)
     {
-        $timeout = $timeout ?? $this->_getConfig()['pageload_timeout'];
-
         // Determine what type of Selector is used.
         // Then use the correct JavaScript to locate the Element.
         if (\Codeception\Util\Locator::isXPath($selector)) {
@@ -38,6 +54,7 @@ public function waitForPwaElementNotVisible($selector, $timeout = null)
 
     /**
      * Wait for a PWA Element to be visible using JavaScript.
+     * Add the WAIT_TIMEOUT variable to your .env file for this action.
      *
      * @param null $selector
      * @param null $timeout
@@ -46,8 +63,6 @@ public function waitForPwaElementNotVisible($selector, $timeout = null)
      */
     public function waitForPwaElementVisible($selector, $timeout = null)
     {
-        $timeout = $timeout ?? $this->_getConfig()['pageload_timeout'];
-
         // Determine what type of Selector is used.
         // Then use the correct JavaScript to locate the Element.
         if (\Codeception\Util\Locator::isXPath($selector)) {