Merge remote-tracking branch 'origin/MAGETWO-44429' into BUGS

Author: Oleksandr Karpenko

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

@@ -1086,9 +1086,10 @@ public function reindex()
                 $flatIndexer->reindexRow($this->getId());
             }
         }
-        $affectedProductIds = $this->getAffectedProductIds();
         $productIndexer = $this->indexerRegistry->get(Indexer\Category\Product::INDEXER_ID);
-        if (!$productIndexer->isScheduled() && !empty($affectedProductIds)) {
+        if (!$productIndexer->isScheduled()
+            && (!empty($this->getAffectedProductIds()) || $this->dataHasChangedFor('is_anchor'))
+        ) {
             $productIndexer->reindexList($this->getPathIds());
         }
     }

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

@@ -380,21 +380,37 @@ public function testReindexFlatEnabled($flatScheduled, $productScheduled, $expec
     public function reindexFlatDisabledTestDataProvider()
     {
         return [
-            'set 1' => [false, 1],
-            'set 2' => [true, 0],
+            [false, null, null, null, 0],
+            [true, null, null, null, 0],
+            [false, [], null, null, 0],
+            [false, ["1", "2"], null, null, 1],
+            [false, null, 1, null, 1],
+            [false, ["1", "2"], 0, 1, 1],
+            [false, null, 1, 1, 0],
         ];
     }
 
     /**
-     * @param $productScheduled
-     * @param $expectedProductReindexCall
+     * @param bool $productScheduled
+     * @param array $affectedIds
+     * @param int|string $isAnchorOrig
+     * @param int|string $isAnchor
+     * @param int $expectedProductReindexCall
      *
      * @dataProvider reindexFlatDisabledTestDataProvider
      */
-    public function testReindexFlatDisabled($productScheduled, $expectedProductReindexCall)
-    {
-        $affectedProductIds = ["1", "2"];
-        $this->category->setAffectedProductIds($affectedProductIds);
+    public function testReindexFlatDisabled(
+        $productScheduled,
+        $affectedIds,
+        $isAnchorOrig,
+        $isAnchor,
+        $expectedProductReindexCall
+    ) {
+        $this->category->setAffectedProductIds($affectedIds);
+        $this->category->setData('is_anchor', $isAnchor);
+        $this->category->setOrigData('is_anchor', $isAnchorOrig);
+        $this->category->setAffectedProductIds($affectedIds);
+
         $pathIds = ['path/1/2', 'path/2/3'];
         $this->category->setData('path_ids', $pathIds);
         $this->category->setId('123');
@@ -403,8 +419,12 @@ public function testReindexFlatDisabled($productScheduled, $expectedProductReind
             ->method('isFlatEnabled')
             ->will($this->returnValue(false));
 
-        $this->productIndexer->expects($this->exactly(1))->method('isScheduled')->will($this->returnValue($productScheduled));
-        $this->productIndexer->expects($this->exactly($expectedProductReindexCall))->method('reindexList')->with($pathIds);
+        $this->productIndexer->expects($this->exactly(1))
+            ->method('isScheduled')
+            ->willReturn($productScheduled);
+        $this->productIndexer->expects($this->exactly($expectedProductReindexCall))
+            ->method('reindexList')
+            ->with($pathIds);
 
         $this->indexerRegistry->expects($this->at(0))
             ->method('get')