Merge remote-tracking branch 'origin/MC-5831' into 2.3-develop-mftf-pr15

Stas Puga · Stas Puga · commit cec53aea5f8f · 2019-04-25T14:30:10.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -117,6 +117,7 @@ public function getGrandTotal()
      */
     public function getGrandTotalIncludingTax()
     {
+        $this->waitForGrandTotal();
         $priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);
         return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/TaxWithCrossBorderTest.php
@@ -37,7 +37,6 @@ class TaxWithCrossBorderTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
-    const STABLE = 'no';
     /* end tags */
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ public function getGrandTotal()`
`117`	`117`	`*/`
`118`	`118`	`public function getGrandTotalIncludingTax()`
`119`	`119`	`{`
	`120`	`+ $this->waitForGrandTotal();`
`120`	`121`	`$priceElement = $this->_rootElement->find($this->grandTotalInclTax, Locator::SELECTOR_CSS);`
`121`	`122`	`return $priceElement->isVisible() ? $this->escapeCurrency($priceElement->getText()) : null;`
`122`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ class TaxWithCrossBorderTest extends Injectable`
`37`	`37`	`{`
`38`	`38`	`/* tags */`
`39`	`39`	`const MVP = 'yes';`
`40`		`- const STABLE = 'no';`
`41`	`40`	`/* end tags */`
`42`	`41`
`43`	`42`	`/**`