MAGETWO-75786: Incorrect count for category filter at layered navigation for configurable with no available options

Author: mslabko

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -814,16 +814,4 @@ protected function reindexRootCategory(Store $store)
             }
         }
     }
-
-    /**
-     * @return \Magento\Framework\EntityManager\MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }

dev/tests/functional/tests/app/Magento/LayeredNavigation/Test/Constraint/AssertProductsCount.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\LayeredNavigation\Test\Constraint;

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php

@@ -6,6 +6,7 @@
 namespace Magento\CatalogSearch\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -199,23 +200,29 @@ public function testReindexParentProductWhenChildBeingDisabled()
     {
         $this->indexer->reindexAll();
 
-        $products = $this->search('Configurable');
+        $visibilityFilter = [
+            Visibility::VISIBILITY_IN_SEARCH,
+            Visibility::VISIBILITY_IN_CATALOG,
+            Visibility::VISIBILITY_BOTH
+        ];
+        $products = $this->search('Configurable', $visibilityFilter);
         $this->assertCount(1, $products);
 
         $childProduct = $this->getProductBySku('configurable_option_single_child');
         $childProduct->setStatus(Product\Attribute\Source\Status::STATUS_DISABLED)->save();
 
-        $products = $this->search('Configurable');
+        $products = $this->search('Configurable', $visibilityFilter);
         $this->assertCount(0, $products);
     }
 
     /**
      * Search the text and return result collection
      *
      * @param string $text
+     * @param null|array $visibilityFilter
      * @return Product[]
      */
-    protected function search($text)
+    protected function search($text, $visibilityFilter = null)
     {
         $this->resourceFulltext->resetSearchResults();
         $query = $this->queryFactory->get();
@@ -230,6 +237,10 @@ protected function search($text)
             ]
         );
         $collection->addSearchFilter($text);
+        if (null !== $visibilityFilter) {
+            $collection->setVisibility($visibilityFilter);
+        }
+
         foreach ($collection as $product) {
             $products[] = $product;
         }