Merge branch 'Test-Refactoring' into sprint-develop

ivy00johns · ivy00johns · commit d3007444e89a · 2017-09-18T11:03:24.000-05:00
diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/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);
     }
 
     /**
diff --git a/src/Magento/FunctionalTestingFramework/Util/msq.php b/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;
         }

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,9 @@ public function waitForPageLoad($timeout = 15)`
`195`	`195`	`{`
`196`	`196`	`$this->waitForJS('return document.readyState == "complete"', $timeout);`
`197`	`197`	`$this->waitForAjaxLoad($timeout);`
	`198`	`+ $this->waitForElementNotVisible('.loading-mask', 30);`
	`199`	`+ $this->waitForElementNotVisible('.admin_data-grid-loading-mask', 30);`
	`200`	`+ $this->waitForElementNotVisible('.admin__form-loading-mask', 30);`
`198`	`201`	`}`
`199`	`202`
`200`	`203`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ function msq($id = null)`
`14`	`14`	`return MagentoSequence::$hash[$id];`
`15`	`15`	`}`
`16`	`16`	`$prefix = MagentoSequence::$prefix;`
`17`		`- $sequence = $prefix . uniqid($id);`
	`17`	`+ $sequence = $prefix . uniqid();`
`18`	`18`	`if ($id) {`
`19`	`19`	`MagentoSequence::$hash[$id] = $sequence;`
`20`	`20`	`}`
`@@ -35,7 +35,7 @@ function msqs($id = null)`
`35`	`35`	`return MagentoSequence::$suiteHash[$id];`
`36`	`36`	`}`
`37`	`37`	`$prefix = MagentoSequence::$prefix;`
`38`		`- $sequence = $prefix . uniqid($id);`
	`38`	`+ $sequence = $prefix . uniqid();`
`39`	`39`	`if ($id) {`
`40`	`40`	`MagentoSequence::$suiteHash[$id] = $sequence;`
`41`	`41`	`}`