Merge branch 'MAGETWO-54283' into pr_branch

Author: mslabko

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -8,12 +8,15 @@
 
 namespace Magento\CatalogWidget\Block\Product;
 
+use Magento\Framework\DataObject\IdentityInterface;
+use Magento\Widget\Block\BlockInterface;
+
 /**
  * Catalog Products List widget block
  * Class ProductsList
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements \Magento\Widget\Block\BlockInterface
+class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implements BlockInterface, IdentityInterface
 {
     /**
      * Default value for products count that will be shown
@@ -78,6 +81,9 @@ class ProductsList extends \Magento\Catalog\Block\Product\AbstractProduct implem
      */
     protected $conditionsHelper;
 
+    /** @var array */
+    private $widgetIdentities;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
@@ -327,7 +333,19 @@ public function getPagerHtml()
      */
     public function getIdentities()
     {
-        return [\Magento\Catalog\Model\Product::CACHE_TAG];
+        if ($this->widgetIdentities === null) {
+            $collection = $this->productCollectionFactory->create();
+            $conditions = $this->getConditions();
+            $conditions->collectValidatedAttributes($collection);
+            $this->sqlBuilder->attachConditionToCollection($collection, $conditions);
+            $this->widgetIdentities = [];
+            foreach ($collection as $product) {
+                $this->widgetIdentities[] = \Magento\Catalog\Model\Product::CACHE_TAG . '_' . $product->getId();
+            }
+            $this->widgetIdentities = $this->widgetIdentities ?: [\Magento\Catalog\Model\Product::CACHE_TAG];
+        }
+
+        return $this->widgetIdentities;
     }
 
     /**

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -261,21 +261,10 @@ public function testCreateCollection($pagerEnable, $productsCount, $productsPerP
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->productsList->setData('conditions_encoded', 'some_serialized_conditions');
 
-        $conditions = $this->getMockBuilder('\Magento\Rule\Model\Condition\Combine')
-            ->setMethods(['collectValidatedAttributes'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $conditions->expects($this->once())->method('collectValidatedAttributes')
-            ->with($collection)
-            ->willReturnSelf();
-
         $this->builder->expects($this->once())->method('attachConditionToCollection')
-            ->with($collection, $conditions)
+            ->with($collection, $this->getConditionsForCollection($collection))
             ->willReturnSelf();
 
-        $this->rule->expects($this->once())->method('loadPost')->willReturnSelf();
-        $this->rule->expects($this->once())->method('getConditions')->willReturn($conditions);
-
         if ($productsPerPage) {
             $this->productsList->setData('products_per_page', $productsPerPage);
         } else {
@@ -333,7 +322,46 @@ public function testShowPager()
 
     public function testGetIdentities()
     {
-        $this->assertEquals([\Magento\Catalog\Model\Product::CACHE_TAG], $this->productsList->getIdentities());
+        $collection = $this->getMockBuilder('\Magento\Catalog\Model\ResourceModel\Product\Collection')
+            ->setMethods([
+                'addAttributeToSelect',
+                'getIterator',
+            ])->disableOriginalConstructor()
+            ->getMock();
+
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
+        $this->productsList->setData('conditions_encoded', 'some_serialized_conditions');
+
+        $this->builder->expects($this->once())->method('attachConditionToCollection')
+            ->with($collection, $this->getConditionsForCollection($collection))
+            ->willReturnSelf();
+        $product = $this->getMock('Magento\Catalog\Api\ProductInterface', ['getId']);
+        $product->expects($this->once())->method('getId')->willReturn('product_id');
+        $collection->expects($this->once())->method('getIterator')->willReturn(new \ArrayIterator([$product]));
+
+        $this->assertEquals(
+            [\Magento\Catalog\Model\Product::CACHE_TAG . '_' . 'product_id'],
+            $this->productsList->getIdentities()
+        );
+    }
+
+    /**
+     * @param $collection
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getConditionsForCollection($collection)
+    {
+        $conditions = $this->getMockBuilder('\Magento\Rule\Model\Condition\Combine')
+            ->setMethods(['collectValidatedAttributes'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $conditions->expects($this->once())->method('collectValidatedAttributes')
+            ->with($collection)
+            ->willReturnSelf();
+
+        $this->rule->expects($this->once())->method('loadPost')->willReturnSelf();
+        $this->rule->expects($this->once())->method('getConditions')->willReturn($conditions);
+        return $conditions;
     }
 
     public function testGetTitle()