Merge remote-tracking branch 'origin/MAGETWO-71587' into 2.1-DEVELOP-PR

Author: VladimirZaets

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -2791,7 +2791,7 @@ private function formatBunchToStockDataRows(
             $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));
         }
 
-        if ($productIdsToReindex && !$indexer->isScheduled()) {
+        if (!empty($productIdsToReindex) && !$indexer->isScheduled()) {
             $indexer->reindexList($productIdsToReindex);
         }
     }

app/code/Magento/CatalogImportExport/Model/Indexer/Product/Flat/Plugin/Import.php

@@ -5,19 +5,30 @@
  */
 namespace Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Catalog\Model\Indexer\Product\Flat\State as FlatState;
+
 class Import
 {
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State
+     */
+    private $flatState;
+
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor
      */
     protected $_productFlatIndexerProcessor;
 
     /**
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor
+     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $flatState
      */
-    public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor)
-    {
+    public function __construct(
+        \Magento\Catalog\Model\Indexer\Product\Flat\Processor $productFlatIndexerProcessor,
+        FlatState $flatState
+    ) {
         $this->_productFlatIndexerProcessor = $productFlatIndexerProcessor;
+        $this->flatState = $flatState;
     }
 
     /**
@@ -31,7 +42,10 @@ public function __construct(\Magento\Catalog\Model\Indexer\Product\Flat\Processo
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
-        $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
+        if ($this->flatState->isFlatEnabled() && !$this->_productFlatIndexerProcessor->isIndexerScheduled()) {
+            $this->_productFlatIndexerProcessor->markIndexerAsInvalid();
+        }
+
         return $import;
     }
 }

app/code/Magento/CatalogImportExport/Test/Unit/Model/Indexer/Product/Flat/Plugin/ImportTest.php

@@ -5,28 +5,89 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Indexer\Product\Flat\Plugin;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class ImportTest extends \PHPUnit_Framework_TestCase
 {
-    public function testAfterImportSource()
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processorMock;
+
+    /**
+     * @var \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import
+     */
+    private $model;
+
+    /**
+     * @var \Magento\Catalog\Model\Indexer\Product\Flat\State|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $flatStateMock;
+
+    /**
+     * @var \Magento\ImportExport\Model\Import|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectMock;
+
+    protected function setUp()
     {
-        /**
-         * @var \Magento\Catalog\Model\Indexer\Product\Flat\Processor|
-         *      \PHPUnit_Framework_MockObject_MockObject $processorMock
-         */
-        $processorMock = $this->getMock(
+        $this->processorMock = $this->getMock(
             'Magento\Catalog\Model\Indexer\Product\Flat\Processor',
-            ['markIndexerAsInvalid'],
+            ['markIndexerAsInvalid', 'isIndexerScheduled'],
+            [],
+            '',
+            false
+        );
+
+        $this->flatStateMock = $this->getMock(
+            '\Magento\Catalog\Model\Indexer\Product\Flat\State',
+            ['isFlatEnabled'],
+            [],
+            '',
+            false
+        );
+
+        $this->subjectMock = $this->getMock(
+            'Magento\ImportExport\Model\Import',
+            [],
             [],
             '',
             false
         );
 
-        $subjectMock = $this->getMock('Magento\ImportExport\Model\Import', [], [], '', false);
-        $processorMock->expects($this->once())->method('markIndexerAsInvalid');
+        $this->model = (new ObjectManager($this))->getObject(
+            'Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import',
+            [
+                'productFlatIndexerProcessor' => $this->processorMock,
+                'flatState' => $this->flatStateMock
+            ]
+        );
+    }
 
+    public function testAfterImportSourceWithFlatEnabledAndIndexerScheduledDisabled()
+    {
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(false);
+        $this->processorMock->expects($this->once())->method('markIndexerAsInvalid');
         $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
+    }
 
-        $model = new \Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import($processorMock);
-        $this->assertEquals($someData, $model->afterImportSource($subjectMock, $someData));
+    public function testAfterImportSourceWithFlatDisabledAndIndexerScheduledDisabled()
+    {
+
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(false);
+        $this->processorMock->expects($this->never())->method('isIndexerScheduled')->willReturn(false);
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
+        $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
+    }
+    public function testAfterImportSourceWithFlatEnabledAndIndexerScheduledEnabled()
+    {
+        $this->flatStateMock->expects($this->once())->method('isFlatEnabled')->willReturn(true);
+        $this->processorMock->expects($this->once())->method('isIndexerScheduled')->willReturn(true);
+        $this->processorMock->expects($this->never())->method('markIndexerAsInvalid');
+        $someData = [1, 2, 3];
+        $this->assertEquals($someData, $this->model->afterImportSource($this->subjectMock, $someData));
     }
 }