MAGETWO-34954: [GITHUB] Move Topmenu CategoryData creation to a public method to enable plugin

Author: Michail Slabko

app/code/Magento/Catalog/Model/Observer.php

@@ -131,13 +131,9 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
             if (!$category->getIsActive()) {
                 continue;
             }
-
             $block->addIdentity(\Magento\Catalog\Model\Category::CACHE_TAG . '_' . $category->getId());
-
             $tree = $parentCategoryNode->getTree();
-
             $categoryData = $this->getMenuCategoryData($category);
-
             $categoryNode = new \Magento\Framework\Data\Tree\Node($categoryData, 'id', $tree, $parentCategoryNode);
             $parentCategoryNode->addChild($categoryNode);
 
@@ -151,7 +147,6 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
         }
     }
 
-
     /**
      * Get category data to be added to the Menu
      *
@@ -160,7 +155,6 @@ protected function _addCategoriesToMenu($categories, $parentCategoryNode, $block
      */
     public function getMenuCategoryData($category)
     {
-
         $nodeId = 'category-node-' . $category->getId();
 
         $categoryData = [

app/code/Magento/Catalog/Test/Unit/Model/ObserverTest.php

@@ -18,27 +18,27 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected $_observer;
 
     /**
-     * @var \Magento\Catalog\Helper\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Helper\Category
      */
     protected $_catalogCategory;
 
     /**
-     * @var \Magento\Catalog\Model\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
      */
     protected $_category;
 
     /**
-     * @var \Magento\Catalog\Model\Category
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Category
      */
     protected $_childrenCategory;
 
     /**
-     * @var \Magento\Catalog\Model\Indexer\Category\Flat\State
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Catalog\Model\Indexer\Category\Flat\State
      */
     protected $_categoryFlatState;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -64,11 +64,13 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $layerResolver = $this->_getCleanMock('Magento\Catalog\Model\Layer\Resolver');
+        $layerResolver->expects($this->once())->method('get')->willReturn(null);
         $this->_observer = (new ObjectManager($this))->getObject('Magento\Catalog\Model\Observer', [
             'categoryResource' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Category'),
             'catalogProduct' => $this->_getCleanMock('\Magento\Catalog\Model\Resource\Product'),
             'storeManager' => $this->_storeManager,
-            'catalogLayer' => $this->_getCleanMock('\Magento\Catalog\Model\Layer\Category'),
+            'layerResolver' => $layerResolver,
             'indexIndexer' => $this->_getCleanMock('\Magento\Index\Model\Indexer'),
             'catalogCategory' => $this->_catalogCategory,
             'catalogData' => $this->_getCleanMock('\Magento\Catalog\Helper\Data'),
@@ -176,4 +178,22 @@ public function testAddCatalogToTopMenuItemsWithFlat()
 
         $this->_observer->addCatalogToTopmenuItems($observer);
     }
+
+    public function testGetMenuCategoryData()
+    {
+        $category = $this->getMock('Magento\Catalog\Model\Category', ['getId', 'getName'], [], '', false);
+        $category->expects($this->once())->method('getId')->willReturn('id');
+        $category->expects($this->once())->method('getName')->willReturn('name');
+        $this->_catalogCategory->expects($this->once())->method('getCategoryUrl')->willReturn('url');
+
+        $this->assertEquals(
+            [
+                'name' => 'name',
+                'id' => 'category-node-id',
+                'url' => 'url',
+                'is_active' => false,
+            ],
+            $this->_observer->getMenuCategoryData($category)
+        );
+    }
 }