MAGETWO-84652: Category page X-Magento-Tags headers contains product cache identities even which category display mode is set to "Static block only" magento#12466

Author: Volodymyr Kublytskyi

app/code/Magento/Catalog/Block/Product/ListProduct.php

@@ -334,13 +334,21 @@ public function prepareSortableFieldsByCategory($category)
     public function getIdentities()
     {
         $identities = [];
-        foreach ($this->_getProductCollection() as $item) {
-            $identities = array_merge($identities, $item->getIdentities());
-        }
+
         $category = $this->getLayer()->getCurrentCategory();
         if ($category) {
             $identities[] = Product::CACHE_PRODUCT_CATEGORY_TAG . '_' . $category->getId();
         }
+
+        //Check if category page shows only static block (No products)
+        if ($category->getData('display_mode') == Category::DM_PAGE) {
+            return $identities;
+        }
+
+        foreach ($this->_getProductCollection() as $item) {
+            $identities = array_merge($identities, $item->getIdentities());
+        }
+
         return $identities;
     }
 

app/code/Magento/Catalog/Test/Unit/Block/Product/ListProductTest.php

@@ -192,7 +192,7 @@ public function testGetIdentities()
             ->will($this->returnValue($this->toolbarMock));
 
         $this->assertEquals(
-            [$productTag, $categoryTag],
+            [$categoryTag, $productTag],
             $this->block->getIdentities()
         );
         $this->assertEquals(