MAGETWO-61628: [Backport] - Match products by rule in admin not working - for 2.0

Author: RomaKis

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -49,10 +49,6 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
         $this->resultJsonFactory = $resultJsonFactory;
         $this->layoutFactory = $layoutFactory;
-
-        if ($this->storeManager == null){
-            $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
-        }
     }
 
     /**
@@ -92,8 +88,9 @@ public function execute()
         }
 
         $storeId = $this->getRequest()->getParam('store');
-        $store = $this->storeManager->getStore($storeId);
-        $this->storeManager->setCurrentStore($store->getCode());
+        $store = $this->getStoreManager()->getStore($storeId);
+        $this->getStoreManager()->setCurrentStore($store->getCode());
+
         $refreshTree = false;
         $data = $this->getRequest()->getPostValue();
         if ($data) {
@@ -102,9 +99,7 @@ public function execute()
                 $parentId = $this->getRequest()->getParam('parent');
                 if (!$parentId) {
                     if ($storeId) {
-                        $parentId = $this->_objectManager->get(
-                            'Magento\Store\Model\StoreManagerInterface'
-                        )->getStore(
+                        $parentId = $this->getStoreManager()->getStore(
                             $storeId
                         )->getRootCategoryId();
                     } else {
@@ -223,4 +218,18 @@ public function execute()
             $redirectParams
         );
     }
+
+    /**
+     * Get StoreManager object
+     *
+     * @return StoreManagerInterface
+     */
+    private function getStoreManager()
+    {
+        if ($this->storeManager == null) {
+            $this->storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
+        }
+
+        return $this->storeManager;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -326,7 +326,7 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
             false,
             true,
             true,
-            ['getStore', 'getRootCategoryId']
+            ['getStore', 'getRootCategoryId', 'setCurrentStore']
         );
         /**
          * @var \Magento\Framework\View\Layout
@@ -364,6 +364,20 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
             false
         );
 
+        /**
+         * @var \Magento\Store\Model\Store
+         * |\PHPUnit_Framework_MockObject_MockObject $storeMock
+         */
+        $storeMock = $this->getMock(
+            \Magento\Store\Model\Store::class,
+            [
+                'getCode',
+            ],
+            [],
+            '',
+            false
+        );
+
         $this->resultRedirectFactoryMock->expects($this->once())
             ->method('create')
             ->will($this->returnValue($resultRedirectMock));
@@ -379,6 +393,15 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
                     ]
                 )
             );
+
+        $storeMock->expects($this->once())
+            ->method('getCode')
+            ->will($this->returnValue('admin'));
+
+        $storeManagerMock->expects($this->once())
+            ->method('setCurrentStore')
+            ->with('admin');
+
         $this->objectManagerMock->expects($this->atLeastOnce())
             ->method('create')
             ->will($this->returnValue($categoryMock));
@@ -441,15 +464,23 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
 
         if (!$parentId) {
             if ($storeId) {
-                $storeManagerMock->expects($this->once())
+                $storeManagerMock->expects($this->exactly(2))
                     ->method('getStore')
                     ->with($storeId)
-                    ->will($this->returnSelf());
+                    ->willReturnOnConsecutiveCalls(
+                        $storeMock,
+                        $this->returnSelf()
+                    );
                 $storeManagerMock->expects($this->once())
                     ->method('getRootCategoryId')
                     ->will($this->returnValue($rootCategoryId));
                 $parentId = $rootCategoryId;
             }
+        } else {
+            $storeManagerMock->expects($this->once())
+                ->method('getStore')
+                ->with($storeId)
+                ->will($this->returnValue($storeMock));
         }
         $categoryMock->expects($this->any())
             ->method('load')