Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-FIXES-2.2

Author: RuslanKostiv1

app/code/Magento/CatalogRule/Plugin/Indexer/Category.php

@@ -35,8 +35,8 @@ public function afterSave(
         \Magento\Catalog\Model\Category $result
     ) {
         /** @var \Magento\Catalog\Model\Category $result */
-        $productIds = $result->getAffectedProductIds();
-        if ($productIds && !$this->productRuleProcessor->isIndexerScheduled()) {
+        $productIds = $result->getChangedProductIds();
+        if (!empty($productIds) && !$this->productRuleProcessor->isIndexerScheduled()) {
             $this->productRuleProcessor->reindexList($productIds);
         }
         return $result;

app/code/Magento/CatalogRule/Test/Unit/Plugin/Indexer/CategoryTest.php

@@ -32,7 +32,7 @@ protected function setUp()
         );
         $this->subject = $this->createPartialMock(
             \Magento\Catalog\Model\Category::class,
-            ['getAffectedProductIds', '__wakeUp']
+            ['getChangedProductIds', '__wakeUp']
         );
 
         $this->plugin = (new ObjectManager($this))->getObject(
@@ -46,7 +46,7 @@ protected function setUp()
     public function testAfterSaveWithoutAffectedProductIds()
     {
         $this->subject->expects($this->any())
-            ->method('getAffectedProductIds')
+            ->method('getChangedProductIds')
             ->will($this->returnValue([]));
 
         $this->productRuleProcessor->expects($this->never())
@@ -60,7 +60,7 @@ public function testAfterSave()
         $productIds = [1, 2, 3];
 
         $this->subject->expects($this->any())
-            ->method('getAffectedProductIds')
+            ->method('getChangedProductIds')
             ->will($this->returnValue($productIds));
 
         $this->productRuleProcessor->expects($this->once())