MAGETWO-62229: There is no Price on product page when product is out of stock

 - Unit tests changes

Author: ameysar

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -67,7 +67,7 @@ protected function setUp()
     {
         $this->product = $this->getMock(
             \Magento\Catalog\Model\Product::class,
-            ['getPriceInfo', '__wakeup', 'getCanShowPrice', 'isSalable'],
+            ['getPriceInfo', '__wakeup', 'getCanShowPrice'],
             [],
             '',
             false
@@ -178,11 +178,6 @@ public function testRenderMsrpDisabled()
             ->with($this->equalTo($this->product))
             ->will($this->returnValue(false));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper
@@ -191,19 +186,6 @@ public function testRenderMsrpDisabled()
         $this->assertRegExp('/[final_price]/', $result);
     }
 
-    public function testNotSalableItem()
-    {
-        $this->salableResolverMock
-            ->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(false);
-
-        $result = $this->object->toHtml();
-
-        $this->assertNotEmpty($result);
-    }
-
     public function testRenderMsrpEnabled()
     {
         $priceType = $this->getMock('Magento\Msrp\Pricing\Price\MsrpPrice', [], [], '', false);
@@ -238,11 +220,6 @@ public function testRenderMsrpEnabled()
             ->with('msrp_price', $this->product, $arguments)
             ->will($this->returnValue($priceBoxRender));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper
@@ -262,11 +239,6 @@ public function testRenderMsrpNotRegisteredException()
             ->with($this->equalTo('msrp_price'))
             ->will($this->throwException(new \InvalidArgumentException()));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper

app/code/Magento/ConfigurableProduct/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -67,7 +67,7 @@ protected function setUp()
     {
         $this->product = $this->getMock(
             \Magento\Catalog\Model\Product::class,
-            ['getPriceInfo', '__wakeup', 'getCanShowPrice', 'isSalable'],
+            ['getPriceInfo', '__wakeup', 'getCanShowPrice'],
             [],
             '',
             false
@@ -178,11 +178,6 @@ public function testRenderMsrpDisabled()
             ->with($this->equalTo($this->product))
             ->will($this->returnValue(false));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper
@@ -191,19 +186,6 @@ public function testRenderMsrpDisabled()
         $this->assertRegExp('/[final_price]/', $result);
     }
 
-    public function testNotSalableItem()
-    {
-        $this->salableResolverMock
-            ->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(false);
-
-        $result = $this->object->toHtml();
-
-        $this->assertNotEmpty($result);
-    }
-
     public function testRenderMsrpEnabled()
     {
         $priceType = $this->getMock('Magento\Msrp\Pricing\Price\MsrpPrice', [], [], '', false);
@@ -238,11 +220,6 @@ public function testRenderMsrpEnabled()
             ->with('msrp_price', $this->product, $arguments)
             ->will($this->returnValue($priceBoxRender));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper
@@ -262,11 +239,6 @@ public function testRenderMsrpNotRegisteredException()
             ->with($this->equalTo('msrp_price'))
             ->will($this->throwException(new \InvalidArgumentException()));
 
-        $this->salableResolverMock->expects($this->any())
-            ->method('isSalable')
-            ->with($this->product)
-            ->willReturn(true);
-
         $result = $this->object->toHtml();
 
         //assert price wrapper