Merge remote-tracking branch 'nord/MAGETWO-38738' into sprint-54-bf

Author: Dooffy

CHANGELOG.md

@@ -112,7 +112,7 @@
     * Fixed an issue where first store could not be selected on frontend
     * Fixed an issue with performance toolkit category creation
     * Fixed an issue when columns 'Interval', 'Price Rule' had incorrect values in Coupon Usage report
-    * Fixed an issue where fatal error occured on Abandoned Carts report grid
+    * Fixed an issue where fatal error occurred on Abandoned Carts report grid
     * Fixed an issue where it was not possible to add product to shopping cart if Use Secure URLs in Frontend = Yes
     * Fixed an issue where email was not required during Guest Checkout 
     * Fixed broken ability to skip reindex in `bin/magento setup:performance:generate-fixtures` command
@@ -2699,7 +2699,7 @@
   * Fixed an issue with status and visibility settings of a related product on the backend
   * Fixed an issue with unused DB indexes, which used resources, but did not contribute to higher performance
   * Fixed an issue where it was possible to create a downloadable product without specifying a link or a file
-  * Fixed an issue where a fatal error occured when opening a fixed bundle product with custom options page on the frontend
+  * Fixed an issue where a fatal error occurred when opening a fixed bundle product with custom options page on the frontend
   * Fixed an issue where the was a wrong config key for backend cataloginventory
 * Processed GitHub requests:
   * [#548] (https://github.com/magento/magento2/issues/548) -- Console installer doesn't checks filesystem permissions

app/code/Magento/Catalog/Block/Navigation.php

@@ -145,15 +145,15 @@ public function getCacheKeyInfo()
             $this->httpContext->getValue(Context::CONTEXT_GROUP),
             'template' => $this->getTemplate(),
             'name' => $this->getNameInLayout(),
-            $this->getCurrenCategoryKey(),
+            $this->getCurrentCategoryKey(),
         ];
         $cacheId = $shortCacheId;
 
         $shortCacheId = array_values($shortCacheId);
         $shortCacheId = implode('|', $shortCacheId);
         $shortCacheId = md5($shortCacheId);
 
-        $cacheId['category_path'] = $this->getCurrenCategoryKey();
+        $cacheId['category_path'] = $this->getCurrentCategoryKey();
         $cacheId['short_cache_id'] = $shortCacheId;
 
         return $cacheId;
@@ -164,7 +164,7 @@ public function getCacheKeyInfo()
      *
      * @return string
      */
-    public function getCurrenCategoryKey()
+    public function getCurrentCategoryKey()
     {
         if (!$this->_currentCategoryKey) {
             $category = $this->_registry->registry('current_category');

app/code/Magento/Catalog/Test/Unit/Block/NavigationTest.php

@@ -12,6 +12,26 @@ class NavigationTest extends \PHPUnit_Framework_TestCase
      */
     protected $block;
 
+    /**
+     * @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $registry;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $design;
+
+    /**
+     * @var \Magento\Framework\App\Http\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $httpContext;
+
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -22,22 +42,85 @@ protected function setUp()
             '',
             false
         );
+        $this->registry = $this->getMock('Magento\Framework\Registry');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->design = $this->getMock('Magento\Framework\View\DesignInterface');
+        $this->httpContext = $this->getMock('Magento\Framework\App\Http\Context', [], [], '', false);
         $this->block = $objectManager->getObject(
             'Magento\Catalog\Block\Navigation',
-            ['categoryFactory' => $categoryFactory]
+            [
+                'categoryFactory' => $categoryFactory,
+                'registry' => $this->registry,
+                'storeManager' => $this->storeManager,
+                'design' => $this->design,
+                'httpContext' => $this->httpContext
+            ]
         );
     }
 
-    protected function tearDown()
-    {
-        $this->block = null;
-    }
-
     public function testGetIdentities()
     {
         $this->assertEquals(
             [\Magento\Catalog\Model\Category::CACHE_TAG, \Magento\Store\Model\Group::CACHE_TAG],
             $this->block->getIdentities()
         );
     }
+
+    public function testGetCurrentCategoryKey()
+    {
+        $categoryKey = 101;
+        $category = $this->getMock('Magento\Catalog\Model\Category', [], [], '', false);
+        $category->expects($this->any())->method('getPath')->willReturn($categoryKey);
+
+        $this->registry->expects($this->any())->method('registry')->with('current_category')->willReturn($category);
+
+        $this->assertEquals($categoryKey, $this->block->getCurrentCategoryKey());
+    }
+
+    public function testGetCurrentCategoryKeyFromRootCategory()
+    {
+        $categoryKey = 102;
+        $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $store->expects($this->any())->method('getRootCategoryId')->willReturn($categoryKey);
+
+        $this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
+
+        $this->assertEquals($categoryKey, $this->block->getCurrentCategoryKey());
+    }
+
+    public function testGetCacheKeyInfo()
+    {
+        $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $store->expects($this->atLeastOnce())->method('getId')->willReturn(55);
+        $store->expects($this->atLeastOnce())->method('getRootCategoryId')->willReturn(60);
+
+        $this->storeManager->expects($this->atLeastOnce())->method('getStore')->willReturn($store);
+
+        $theme = $this->getMock('\Magento\Framework\View\Design\ThemeInterface');
+        $theme->expects($this->atLeastOnce())->method('getId')->willReturn(65);
+
+        $this->design->expects($this->atLeastOnce())->method('getDesignTheme')->willReturn($theme);
+
+        $this->httpContext->expects($this->atLeastOnce())
+            ->method('getValue')
+            ->with(\Magento\Customer\Model\Context::CONTEXT_GROUP)
+            ->willReturn(70);
+
+        $this->block->setTemplate('block_template');
+        $this->block->setNameInLayout('block_name');
+
+        $expectedResult = [
+            'CATALOG_NAVIGATION',
+            55,
+            65,
+            70,
+            'template' => 'block_template',
+            'name' => 'block_name',
+            60,
+            'category_path' => 60,
+            'short_cache_id' => 'c3de6d1160d1e7730b04d6cad409a2b4'
+        ];
+
+        $this->assertEquals($expectedResult, $this->block->getCacheKeyInfo());
+    }
 }

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2245,4 +2245,5 @@
     ['getOrigData', 'Magento\Framework\Object', 'Moved to Magento\Framework\Model\AbstractModel'],
     ['dataHasChangedFor', 'Magento\Framework\Object', 'Moved to Magento\Framework\Model\AbstractModel'],
     ['setDataChanges', 'Magento\Framework\Object', 'Moved to Magento\Framework\Model\AbstractModel'],
+    ['getCurrenCategoryKey', 'Magento\Catalog\Block\Navigation', 'getCurrentCategoryKey'],
 ];