- Adding additional checks for all 3 spinners in the Magento grid UI components.

- Removing the $id property from the uniqid function so it doesn't include it in the random number that is generated. This breaks many fields in the admin sense they don't accept special characters.

Author: ivy00johns

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -195,6 +195,9 @@ public function waitForPageLoad($timeout = 15)
     {
         $this->waitForJS('return document.readyState == "complete"', $timeout);
         $this->waitForAjaxLoad($timeout);
+        $this->waitForElementNotVisible('.loading-mask', 30);
+        $this->waitForElementNotVisible('.admin_data-grid-loading-mask', 30);
+        $this->waitForElementNotVisible('.admin__form-loading-mask', 30);
     }
 
     /**

src/Magento/FunctionalTestingFramework/Util/msq.php

@@ -14,7 +14,7 @@ function msq($id = null)
             return MagentoSequence::$hash[$id];
         }
         $prefix = MagentoSequence::$prefix;
-        $sequence = $prefix . uniqid($id);
+        $sequence = $prefix . uniqid();
         if ($id) {
             MagentoSequence::$hash[$id] = $sequence;
         }
@@ -35,7 +35,7 @@ function msqs($id = null)
             return MagentoSequence::$suiteHash[$id];
         }
         $prefix = MagentoSequence::$prefix;
-        $sequence = $prefix . uniqid($id);
+        $sequence = $prefix . uniqid();
         if ($id) {
             MagentoSequence::$suiteHash[$id] = $sequence;
         }