Merge remote-tracking branch 'tango/MAGETWO-98801' into PR-05

Author: dhorytskyi

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

@@ -169,8 +169,7 @@ public function getAddToCartUrl($product, $additional = [])
     }
 
     /**
-     * Get JSON encoded configuration array which can be used for JS dynamic
-     * price calculation depending on product options
+     * Get JSON encoded configuration which can be used for JS dynamic price calculation depending on product options
      *
      * @return string
      */
@@ -262,6 +261,7 @@ public function isStartCustomization()
 
     /**
      * Get default qty - either as preconfigured, or as 1.
+     *
      * Also restricts it by minimal qty.
      *
      * @param null|\Magento\Catalog\Model\Product $product
@@ -323,10 +323,7 @@ public function getQuantityValidators()
     public function getIdentities()
     {
         $identities = $this->getProduct()->getIdentities();
-        $category = $this->_coreRegistry->registry('current_category');
-        if ($category) {
-            $identities[] = Category::CACHE_TAG . '_' . $category->getId();
-        }
+
         return $identities;
     }
 

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

@@ -8,6 +8,9 @@
 
 namespace Magento\Catalog\Test\Unit\Block\Product;
 
+/**
+ * Class ViewTest
+ */
 class ViewTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -25,6 +28,9 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     protected $registryMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
         $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -36,6 +42,9 @@ protected function setUp()
         );
     }
 
+    /**
+     * @return void
+     */
     public function testShouldRenderQuantity()
     {
         $productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
@@ -61,28 +70,26 @@ public function testShouldRenderQuantity()
         $this->assertEquals(false, $this->view->shouldRenderQuantity());
     }
 
+    /**
+     * @return void
+     */
     public function testGetIdentities()
     {
         $productTags = ['cat_p_1'];
         $product = $this->createMock(\Magento\Catalog\Model\Product::class);
-        $category = $this->createMock(\Magento\Catalog\Model\Category::class);
 
         $product->expects($this->once())
             ->method('getIdentities')
             ->will($this->returnValue($productTags));
-        $category->expects($this->once())
-            ->method('getId')
-            ->will($this->returnValue(1));
         $this->registryMock->expects($this->any())
             ->method('registry')
             ->will(
                 $this->returnValueMap(
                     [
                         ['product', $product],
-                        ['current_category', $category],
                     ]
                 )
             );
-        $this->assertEquals(['cat_p_1', 'cat_c_1'], $this->view->getIdentities());
+        $this->assertEquals($productTags, $this->view->getIdentities());
     }
 }