MAGETWO-52067: Downloadable product price doesn't include link price in wishlist

Sergey Semenov · Sergey Semenov · commit 6bf2c4927bab · 2016-04-29T18:39:36.000+03:00
diff --git a/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php b/app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionPriceTest.php
@@ -91,15 +91,8 @@ protected function setUp()
             '',
             false
         );
-        $this->calculatorMock = $this->getMock(
-            'Magento\Framework\Pricing\Adjustment\CalculatorInterface',
-            [],
-            [],
-            '',
-            false,
-            true,
-            false
-        );
+        $this->calculatorMock = $this->getMockBuilder('Magento\Framework\Pricing\Adjustment\CalculatorInterface')
+            ->getMockForAbstractClass();
         $this->eventManagerMock = $this->getMock(
             'Magento\Framework\Event\Manager',
             ['dispatch'],
@@ -349,4 +342,42 @@ public function testGetProductDynamicBundle()
         $product = $this->selectionPrice->getProduct();
         $this->assertEquals($this->productMock, $product);
     }
+
+    public function testGetAmount()
+    {
+        $this->setupSelectionPrice();
+
+        $price = 10.;
+        $amount = 20.;
+
+        $this->priceInfoMock->expects($this->once())
+            ->method('getPrice')
+            ->with(\Magento\Bundle\Pricing\Price\FinalPrice::PRICE_CODE)
+            ->willReturn($this->finalPriceMock);
+
+        $this->finalPriceMock->expects($this->once())
+            ->method('getValue')
+            ->willReturn($price);
+
+        $this->discountCalculatorMock->expects($this->once())
+            ->method('calculateDiscount')
+            ->with($this->bundleMock, $price)
+            ->willReturn($price);
+
+        $this->priceCurrencyMock->expects($this->once())
+            ->method('round')
+            ->with($price)
+            ->willReturn($price);
+
+        $this->bundleMock->expects($this->any())
+            ->method('getPriceType')
+            ->willReturn(\Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC);
+
+        $this->calculatorMock->expects($this->once())
+            ->method('getAmount')
+            ->with($price, $this->productMock, null)
+            ->willReturn($amount);
+
+        $this->assertEquals($amount, $this->selectionPrice->getAmount());
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Price/BasePriceTest.php
@@ -29,7 +29,7 @@ class BasePriceTest extends \PHPUnit_Framework_TestCase
     protected $saleableItemMock;
 
     /**
-     * @var \Magento\Framework\Pricing\Adjustment\Calculator
+     * @var \Magento\Framework\Pricing\Adjustment\Calculator|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $calculatorMock;
 
@@ -111,4 +111,23 @@ public function getValueDataProvider()
     {
         return [[77, 77], [0, 0], [false, 99]];
     }
+
+    public function testGetAmount()
+    {
+        $amount = 20.;
+
+        $priceMock = $this->getMockBuilder('Magento\Framework\Pricing\Price\PriceInterface')
+            ->getMockForAbstractClass();
+
+        $this->priceInfoMock->expects($this->once())
+            ->method('getPrices')
+            ->willReturn([$priceMock]);
+
+        $this->calculatorMock->expects($this->once())
+            ->method('getAmount')
+            ->with(false, $this->saleableItemMock)
+            ->willReturn($amount);
+
+        $this->assertEquals($amount, $this->basePrice->getAmount());
+    }
 }
diff --git a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/ConfigurableProduct.php
@@ -9,7 +9,7 @@
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 
-class ConfigurableProductPrice extends FinalPrice implements ConfiguredPriceInterface
+class ConfigurableProduct extends FinalPrice implements ConfiguredPriceInterface
 {
     /**
      * @var ItemInterface
diff --git a/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/Downloadable.php b/app/code/Magento/Wishlist/Pricing/ConfiguredPrice/Downloadable.php
@@ -9,7 +9,7 @@
 use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;
 use Magento\Catalog\Pricing\Price\FinalPrice;
 
-class DownloadablePrice extends FinalPrice implements ConfiguredPriceInterface
+class Downloadable extends FinalPrice implements ConfiguredPriceInterface
 {
     /**
      * Price type configured
diff --git a/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/Model/Rss/WishlistTest.php
@@ -53,7 +53,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
     protected $catalogOutputMock;
 
     /**
-     * @var \Magento\Catalog\Helper\Output
+     * @var \Magento\Catalog\Helper\Output|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutMock;
 
@@ -315,4 +315,68 @@ public function testIsAuthRequired()
             ->will($this->returnValue($wishlist));
         $this->assertEquals(false, $this->model->isAuthRequired());
     }
+
+    public function testGetProductPriceHtmlBlockDoesntExists()
+    {
+        $price = 10.;
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $renderBlockMock = $this->getMockBuilder('Magento\Framework\Pricing\Render')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $renderBlockMock->expects($this->once())
+            ->method('render')
+            ->with(
+                'wishlist_configured_price',
+                $productMock,
+                ['zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST]
+            )
+            ->willReturn($price);
+
+        $this->layoutMock->expects($this->once())
+            ->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn(false);
+        $this->layoutMock->expects($this->once())
+            ->method('createBlock')
+            ->with(
+                'Magento\Framework\Pricing\Render',
+                'product.price.render.default',
+                ['data' => ['price_render_handle' => 'catalog_product_prices']]
+            )
+            ->willReturn($renderBlockMock);
+
+        $this->assertEquals($price, $this->model->getProductPriceHtml($productMock));
+    }
+
+    public function testGetProductPriceHtmlBlockExists()
+    {
+        $price = 10.;
+
+        $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $renderBlockMock = $this->getMockBuilder('Magento\Framework\Pricing\Render')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $renderBlockMock->expects($this->once())
+            ->method('render')
+            ->with(
+                'wishlist_configured_price',
+                $productMock,
+                ['zone' => \Magento\Framework\Pricing\Render::ZONE_ITEM_LIST]
+            )
+            ->willReturn($price);
+
+        $this->layoutMock->expects($this->once())
+            ->method('getBlock')
+            ->with('product.price.render.default')
+            ->willReturn($renderBlockMock);
+
+        $this->assertEquals($price, $this->model->getProductPriceHtml($productMock));
+    }
 }
diff --git a/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php b/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/ConfigurableProductTest.php
@@ -9,9 +9,9 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Framework\Pricing\SaleableInterface;
-use Magento\Wishlist\Pricing\ConfiguredPrice\ConfigurableProductPrice;
+use Magento\Wishlist\Pricing\ConfiguredPrice\ConfigurableProduct;
 
-class ConfigurableProductPriceTest extends \PHPUnit_Framework_TestCase
+class ConfigurableProductTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var SaleableInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -29,7 +29,7 @@ class ConfigurableProductPriceTest extends \PHPUnit_Framework_TestCase
     private $priceCurrency;
 
     /**
-     * @var ConfigurableProductPrice
+     * @var ConfigurableProduct
      */
     private $model;
 
@@ -59,7 +59,7 @@ protected function setUp()
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')
             ->getMockForAbstractClass();
 
-        $this->model = new ConfigurableProductPrice(
+        $this->model = new ConfigurableProduct(
             $this->saleableItem,
             null,
             $this->calculator,
@@ -82,7 +82,7 @@ public function testGetValue()
             ->getMock();
         $this->priceInfoMock->expects($this->once())
             ->method('getPrice')
-            ->with(ConfigurableProductPrice::PRICE_CODE)
+            ->with(ConfigurableProduct::PRICE_CODE)
             ->willReturn($priceMock);
 
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
diff --git a/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/DownloadableTest.php b/app/code/Magento/Wishlist/Test/Unit/Pricing/ConfiguredPrice/DownloadableTest.php
@@ -10,9 +10,9 @@
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Pricing\PriceInfoInterface;
 use Magento\Framework\Pricing\SaleableInterface;
-use Magento\Wishlist\Pricing\ConfiguredPrice\DownloadablePrice;
+use Magento\Wishlist\Pricing\ConfiguredPrice\Downloadable;
 
-class DownloadablePriceTest extends \PHPUnit_Framework_TestCase
+class DownloadableTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var SaleableInterface|\PHPUnit_Framework_MockObject_MockObject
@@ -30,7 +30,7 @@ class DownloadablePriceTest extends \PHPUnit_Framework_TestCase
     private $priceCurrency;
 
     /**
-     * @var DownloadablePrice
+     * @var Downloadable
      */
     private $model;
 
@@ -62,7 +62,7 @@ protected function setUp()
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')
             ->getMockForAbstractClass();
 
-        $this->model = new DownloadablePrice(
+        $this->model = new Downloadable(
             $this->saleableItem,
             null,
             $this->calculator,
diff --git a/app/code/Magento/Wishlist/etc/di.xml b/app/code/Magento/Wishlist/etc/di.xml
@@ -50,14 +50,14 @@
     <virtualType name="Magento\ConfigurableProduct\Pricing\Price\Pool" type="Magento\Framework\Pricing\Price\Pool">
         <arguments>
             <argument name="prices" xsi:type="array">
-                <item name="wishlist_configured_price" xsi:type="string">Magento\Wishlist\Pricing\ConfiguredPrice\ConfigurableProductPrice</item>
+                <item name="wishlist_configured_price" xsi:type="string">Magento\Wishlist\Pricing\ConfiguredPrice\ConfigurableProduct</item>
             </argument>
         </arguments>
     </virtualType>
     <virtualType name="Magento\Downloadable\Pricing\Price\Pool" type="Magento\Framework\Pricing\Price\Pool">
         <arguments>
             <argument name="prices" xsi:type="array">
-                <item name="wishlist_configured_price" xsi:type="string">Magento\Wishlist\Pricing\ConfiguredPrice\DownloadablePrice</item>
+                <item name="wishlist_configured_price" xsi:type="string">Magento\Wishlist\Pricing\ConfiguredPrice\Downloadable</item>
             </argument>
         </arguments>
     </virtualType>

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`use Magento\Catalog\Pricing\Price\ConfiguredPriceInterface;`
`10`	`10`	`use Magento\Catalog\Pricing\Price\FinalPrice;`
`11`	`11`
`12`		`-class ConfigurableProductPrice extends FinalPrice implements ConfiguredPriceInterface`
	`12`	`+class ConfigurableProduct extends FinalPrice implements ConfiguredPriceInterface`
`13`	`13`	`{`
`14`	`14`	`/**`
`15`	`15`	`* @var ItemInterface`