diff --git a/app/code/Magento/Catalog/Observer/AddCatalogToTopmenuItemsObserver.php b/app/code/Magento/Catalog/Observer/AddCatalogToTopmenuItemsObserver.php index 8dab4df1c131c162aa953d67de3453e1f24b313a..8721fd3e7e93730dff1cecc68148c94d477bd6eb 100644 --- a/app/code/Magento/Catalog/Observer/AddCatalogToTopmenuItemsObserver.php +++ b/app/code/Magento/Catalog/Observer/AddCatalogToTopmenuItemsObserver.php @@ -149,7 +149,7 @@ class AddCatalogToTopmenuItemsObserver implements ObserverInterface $collection->addAttributeToSelect('name'); $collection->addFieldToFilter('path', ['like' => '1/' . $rootId . '/%']); //load only from store root $collection->addAttributeToFilter('include_in_menu', 1); - $collection->addAttributeToFilter('is_active', 1); + $collection->addIsActiveFilter(); $collection->addUrlRewriteToResult(); $collection->addOrder('level', Collection::SORT_ORDER_ASC); $collection->addOrder('position', Collection::SORT_ORDER_ASC); diff --git a/app/code/Magento/Catalog/Test/Unit/Observer/AddCatalogToTopmenuItemsObserverTest.php b/app/code/Magento/Catalog/Test/Unit/Observer/AddCatalogToTopmenuItemsObserverTest.php index e0eb21a8bba306a258a26440a5cf957438427c5e..a8c8405730b143ae61d83e67d8a2e5dcd408e56a 100644 --- a/app/code/Magento/Catalog/Test/Unit/Observer/AddCatalogToTopmenuItemsObserverTest.php +++ b/app/code/Magento/Catalog/Test/Unit/Observer/AddCatalogToTopmenuItemsObserverTest.php @@ -81,9 +81,18 @@ class AddCatalogToTopmenuItemsObserverTest extends \PHPUnit_Framework_TestCase ->getMock(); $collection = $this->getMockBuilder('\Magento\Catalog\Model\ResourceModel\Category\Collection') - ->disableOriginalConstructor() + ->setMethods( + [ + 'addIsActiveFilter', + 'addAttributeToSelect', + 'addFieldToFilter', + 'addAttributeToFilter', + 'addUrlRewriteToResult', + 'getIterator' + ] + )->disableOriginalConstructor() ->getMock(); - + $collection->expects($this->once())->method('addIsActiveFilter'); $collectionFactory->expects($this->once())->method('create') ->willReturn($collection); @@ -151,6 +160,4 @@ class AddCatalogToTopmenuItemsObserverTest extends \PHPUnit_Framework_TestCase $observer = $this->_preparationData(); $this->_observer->execute($observer); } - - }