Merge remote-tracking branch 'origin/MAGETWO-62076' into NORD-PR-INTERNAL

RuslanKostiv1 · RuslanKostiv1 · commit 8213176ef635 · 2017-04-26T12:49:37.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.php
@@ -124,7 +124,7 @@ public function hasGroupPriceOptions()
     }
 
     /**
-     * Wait until price form locks
+     * Waiting until advanced price form becomes hidden
      *
      * @return void
      */
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductFormattingTierPrice.php
@@ -24,7 +24,7 @@ public function processAssert(CatalogProductEdit $productPage)
     {
         $productPage->getProductForm()->openSection('advanced-pricing');
         $productPage->getAdvancedPrice()->getFieldsData([]);
-        $productPage->getAdvancedPrice()->getTierPriceForm()->waitUntilTierPriceFormLocks();
+        $productPage->getAdvancedPrice()->getTierPriceForm()->waitTierPriceFormLocks();
         \PHPUnit_Framework_Assert::assertFalse(
             $productPage->getAdvancedPrice()->getTierPriceForm()->isVisible(),
             'Advanced price form still visible'

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function hasGroupPriceOptions()`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`/**`
`127`		`- * Wait until price form locks`
	`127`	`+ * Waiting until advanced price form becomes hidden`
`128`	`128`	`*`
`129`	`129`	`* @return void`
`130`	`130`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function processAssert(CatalogProductEdit $productPage)`
`24`	`24`	`{`
`25`	`25`	`$productPage->getProductForm()->openSection('advanced-pricing');`
`26`	`26`	`$productPage->getAdvancedPrice()->getFieldsData([]);`
`27`		`- $productPage->getAdvancedPrice()->getTierPriceForm()->waitUntilTierPriceFormLocks();`
	`27`	`+ $productPage->getAdvancedPrice()->getTierPriceForm()->waitTierPriceFormLocks();`
`28`	`28`	`\PHPUnit_Framework_Assert::assertFalse(`
`29`	`29`	`$productPage->getAdvancedPrice()->getTierPriceForm()->isVisible(),`
`30`	`30`	`'Advanced price form still visible'`