MAGETWO-70346: Configurable product shows on frontend after deleting child

Author: Eric Bohanon

app/code/Magento/Catalog/Model/Indexer/Product/Full.php

@@ -8,8 +8,6 @@
 
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\PageCache\Model\Config;
-use Magento\Framework\App\Cache\TypeListInterface;
 
 /**
  * Reindex all relevant product indexers
@@ -21,16 +19,6 @@ class Full implements ActionInterface
      */
     private $indexerRegistry;
 
-    /**
-     * @var Config
-     */
-    private $pageCacheConfig;
-
-    /**
-     * @var TypeListInterface
-     */
-    private $cacheTypeList;
-
     /**
      * @var string[]
      */
@@ -40,19 +28,13 @@ class Full implements ActionInterface
      * Initialize dependencies
      *
      * @param IndexerRegistry $indexerRegistry
-     * @param Config $pageCacheConfig
-     * @param TypeListInterface $cacheTypeList
      * @param string[] $indexerList
      */
     public function __construct(
         IndexerRegistry $indexerRegistry,
-        Config $pageCacheConfig,
-        TypeListInterface $cacheTypeList,
         array $indexerList
     ) {
         $this->indexerRegistry = $indexerRegistry;
-        $this->pageCacheConfig = $pageCacheConfig;
-        $this->cacheTypeList = $cacheTypeList;
         $this->indexerList = $indexerList;
     }
 

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/FullTest.php

@@ -10,8 +10,6 @@
 use Magento\Framework\Indexer\IndexerInterface;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Indexer\IndexerRegistry;
-use Magento\PageCache\Model\Config;
-use Magento\Framework\App\Cache\TypeListInterface;
 
 class FullTest extends TestCase
 {
@@ -25,16 +23,6 @@ class FullTest extends TestCase
      */
     private $indexerRegistryMock;
 
-    /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $configMock;
-
-    /**
-     * @var TypeListInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $typeListMock;
-
     /**
      * @var Full
      */
@@ -44,15 +32,11 @@ public function setUp()
     {
         $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->indexerRegistryMock = $this->createMock(IndexerRegistry::class);
-        $this->configMock = $this->createMock(Config::class);
-        $this->typeListMock = $this->getMockForAbstractClass(TypeListInterface::class, [], "", false);
 
         $this->full = $this->objectManager->getObject(
             Full::class,
             [
                 'indexerRegistry' => $this->indexerRegistryMock,
-                'pageCacheConfig' => $this->configMock,
-                'cacheTypeList' => $this->typeListMock,
                 'indexerList' => ['catalog_indexer', 'product_indexer', 'stock_indexer', 'search_indexer']
             ]
         );
@@ -64,20 +48,6 @@ public function testExecuteFull()
         $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
         $indexerMock->expects($this->exactly(4))->method('reindexAll');
         $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(true);
-        $this->typeListMock->expects($this->once())->method('invalidate')->with('full_page');
-
-        $this->full->executeFull();
-    }
-
-    public function testExecuteFullPageCacheDisabled()
-    {
-        $indexerMock = $this->getMockForAbstractClass(IndexerInterface::class, [], "", false);
-        $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
-        $indexerMock->expects($this->exactly(4))->method('reindexAll');
-        $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(false);
-        $this->typeListMock->expects($this->never())->method('invalidate');
 
         $this->full->executeFull();
     }
@@ -88,20 +58,6 @@ public function testExecuteList()
         $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
         $indexerMock->expects($this->exactly(4))->method('reindexList')->with([1, 2]);
         $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(true);
-        $this->typeListMock->expects($this->once())->method('invalidate')->with('full_page');
-
-        $this->full->executeList([1, 2]);
-    }
-
-    public function testExecuteListPageCacheDisabled()
-    {
-        $indexerMock = $this->getMockForAbstractClass(IndexerInterface::class, [], "", false);
-        $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
-        $indexerMock->expects($this->exactly(4))->method('reindexList')->with([1, 2]);
-        $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(false);
-        $this->typeListMock->expects($this->never())->method('invalidate');
 
         $this->full->executeList([1, 2]);
     }
@@ -112,20 +68,6 @@ public function testExecuteRow()
         $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
         $indexerMock->expects($this->exactly(4))->method('reindexRow')->with(1);
         $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(true);
-        $this->typeListMock->expects($this->once())->method('invalidate')->with('full_page');
-
-        $this->full->executeRow(1);
-    }
-
-    public function testExecuteRowPageCacheDisabled()
-    {
-        $indexerMock = $this->getMockForAbstractClass(IndexerInterface::class, [], "", false);
-        $indexerMock->expects($this->exactly(4))->method('isScheduled')->willReturn(false);
-        $indexerMock->expects($this->exactly(4))->method('reindexRow')->with(1);
-        $this->indexerRegistryMock->expects($this->exactly(4))->method('get')->willReturn($indexerMock);
-        $this->configMock->expects($this->once())->method('isEnabled')->willReturn(false);
-        $this->typeListMock->expects($this->never())->method('invalidate');
 
         $this->full->executeRow(1);
     }