Merge branch 'MAGETWO-71515' into 2.1-develop-PR

Author: Dmytro Voskoboinikov

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

@@ -211,10 +211,23 @@ class View extends AbstractConfigureBlock
     /**
      * Get block price.
      *
+     * @param FixtureInterface|null $product
+     *
      * @return Price
      */
-    public function getPriceBlock()
+    public function getPriceBlock(FixtureInterface $product = null)
     {
+        $typeId = null;
+
+        if ($product) {
+            $dataConfig = $product->getDataConfig();
+            $typeId = isset($dataConfig['type_id']) ? $dataConfig['type_id'] : null;
+        }
+
+        if ($this->hasRender($typeId)) {
+            return $this->callRender($typeId, 'getPriceBlock');
+        }
+
         return $this->blockFactory->create(
             'Magento\Catalog\Test\Block\Product\Price',
             ['element' => $this->_rootElement->find($this->priceBlock, Locator::SELECTOR_XPATH)]

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Block/Product/View.php

@@ -6,6 +6,7 @@
 namespace Magento\ConfigurableProduct\Test\Block\Product;
 
 use Magento\ConfigurableProduct\Test\Block\Product\View\ConfigurableOptions;
+use Magento\Mtf\Client\Locator;
 use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\Fixture\InjectableFixture;
 
@@ -18,9 +19,13 @@ class View extends \Magento\Catalog\Test\Block\Product\View
     /**
      * Gets a configurable product price block.
      *
+     * @param FixtureInterface|null $product
+     *
      * @return Price
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function getPriceBlock()
+    public function getPriceBlock(FixtureInterface $product = null)
     {
         return $this->blockFactory->create(
             'Magento\ConfigurableProduct\Test\Block\Product\Price',

dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductPage.php

@@ -171,7 +171,7 @@ protected function getHighestConfigurablePrice()
     protected function verifyPriceLabel()
     {
         /** @var \Magento\ConfigurableProduct\Test\Block\Product\Price $priceBlock */
-        $priceBlock = $this->productView->getPriceBlock();
+        $priceBlock = $this->productView->getPriceBlock($this->product);
 
         $fixtureLowestPrice = $this->getLowestConfigurablePrice();
         $fixtureHighestPrice = $this->getHighestConfigurablePrice();