MAGETWO-98603: [2.3] Fixed Tier Pricing for Bundle items doesn't work

Author: serhii-balko

app/code/Magento/Bundle/Test/Unit/Block/DataProviders/OptionPriceRendererTest.php

@@ -51,23 +51,20 @@ protected function setUp()
     /**
      * Test to render Tier price html
      *
-     * @param bool $priceRenderExist
-     * @param string $expectedHtml
-     * @dataProvider renderTierPriceDataProvider
+     * @return void
      */
-    public function testRenderTierPrice(bool $priceRenderExist, string $expectedHtml): void
+    public function testRenderTierPrice(): void
     {
-        $priceRenderer = false;
+        $expectedHtml = 'tier price html';
         $expectedArguments = ['zone' => Render::ZONE_ITEM_OPTION];
+
         $productMock = $this->createMock(Product::class);
 
-        if ($priceRenderExist) {
-            $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
-            $priceRenderer->expects($this->once())
-                ->method('render')
-                ->with('tier_price', $productMock, $expectedArguments)
-                ->willReturn($expectedHtml);
-        }
+        $priceRenderer = $this->createPartialMock(BlockInterface::class, ['toHtml', 'render']);
+        $priceRenderer->expects($this->once())
+            ->method('render')
+            ->with('tier_price', $productMock, $expectedArguments)
+            ->willReturn($expectedHtml);
 
         $this->layoutMock->method('getBlock')
             ->with('product.price.render.default')
@@ -81,12 +78,22 @@ public function testRenderTierPrice(bool $priceRenderExist, string $expectedHtml
     }
 
     /**
-     * Data provider for test to render Tier price
+     * Test to render Tier price html when render block is not exists
      *
-     * @return array
+     * @return void
      */
-    public function renderTierPriceDataProvider(): array
+    public function testRenderTierPriceNotExist(): void
     {
-        return [[true, 'tier price html'], [false, '']];
+        $productMock = $this->createMock(Product::class);
+
+        $this->layoutMock->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn(false);
+
+        $this->assertEquals(
+            '',
+            $this->renderer->renderTierPrice($productMock),
+            'Render Tier price is wrong'
+        );
     }
 }

dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-include __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
 
 /** @var $productFactory Magento\Catalog\Model\ProductFactory */
 $productFactory = $objectManager->create(\Magento\Catalog\Model\ProductFactory::class);

dev/tests/integration/testsuite/Magento/Bundle/_files/product_with_simple_tier_pricing_rollback.php

@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-include __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple_rollback.php';
 
 /** @var \Magento\Framework\Registry $registry */
 $registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);