Merge remote-tracking branch 'm2/2.0' into MAGETWO-55678

Author: Sergey Shvets

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -118,4 +118,16 @@ public function showMinimalPrice()
         && $minimalPriceAValue
         && $minimalPriceAValue < $finalPriceValue;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getCacheKeyInfo()
+    {
+        $cacheKeys = parent::getCacheKeyInfo();
+        $cacheKeys['display_minimal_price'] = $this->getDisplayMinimalPrice();
+        return $cacheKeys;
+    }
 }

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

@@ -81,6 +81,22 @@ protected function setUp()
             ->method('getBlock')
             ->will($this->returnValue($this->priceBox));
 
+        $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+            ->setMethods(['getStore', 'getCode'])
+            ->getMockForAbstractClass();
+        $storeManager->expects($this->any())->method('getStore')->willReturnSelf();
+
+        $appState = $this->getMockBuilder('\Magento\Framework\App\State')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resolver = $this->getMockBuilder('\Magento\Framework\View\Element\Template\File\Resolver')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $urlBuilder = $this->getMockBuilder('\Magento\Framework\UrlInterface')
+            ->getMockForAbstractClass();
+
         $scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
         $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
         $context->expects($this->any())
@@ -98,6 +114,17 @@ protected function setUp()
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->will($this->returnValue($scopeConfigMock));
+        $context->expects($this->any())
+            ->method('getStoreManager')
+            ->will($this->returnValue($storeManager));
+        $context->expects($this->any())
+            ->method('getAppState')
+            ->will($this->returnValue($appState));
+        $context->expects($this->any())
+            ->method('getResolver')
+            ->will($this->returnValue($resolver));
+        $context->expects($this->any())
+            ->method('getUrlBuilder')->will($this->returnValue($urlBuilder));
 
         $this->rendererPool = $this->getMockBuilder('Magento\Framework\Pricing\Render\RendererPool')
             ->disableOriginalConstructor()
@@ -332,4 +359,9 @@ public function testHidePrice()
 
         $this->assertEmpty($this->object->toHtml());
     }
+
+    public function testGetCacheKeyInfo()
+    {
+        $this->assertArrayHasKey('display_minimal_price', $this->object->getCacheKeyInfo());
+    }
 }