From 8e8d0d2e2351fd9b2dbf1937156b0264440c4394 Mon Sep 17 00:00:00 2001
From: Alex Paliarush <apaliarush@magento.com>
Date: Wed, 30 May 2018 19:31:18 -0500
Subject: [PATCH] ENGCOM-1663: Include 'products' in category query #48

---
 .../Catalog/_files/categories_indexed.php     | 19 ++++++++-----------
 .../_files/categories_indexed_rollback.php    | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
index f7637097840..ff444813a9d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 include __DIR__ . '/categories.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */
-$categoryProductIndexer = $objectManager->get(
-    \Magento\Catalog\Model\Indexer\Category\Product\Processor::class
-);
-$categoryProductIndexer->reindexAll();
-
-/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */
-$inventoryIndexer = $objectManager->get(
-    \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class
-);
-$inventoryIndexer->reindexAll();
+/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */
+$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class);
+$indexerCollection = $indexerCollectionFactory->create();
+$indexers = $indexerCollection->getItems();
+foreach ($indexers as $indexer) {
+    $indexer->reindexAll();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php
index 573fb7c3a2b..338a4b23bee 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php
@@ -3,19 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 include __DIR__ . '/categories_rollback.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-/** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */
-$categoryProductIndexer = $objectManager->get(
-    \Magento\Catalog\Model\Indexer\Category\Product\Processor::class
-);
-$categoryProductIndexer->reindexAll();
-
-/** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */
-$inventoryIndexer = $objectManager->get(
-    \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class
-);
-$inventoryIndexer->reindexAll();
+/** @var \Magento\Indexer\Model\Indexer\CollectionFactory $indexerCollectionFactory */
+$indexerCollectionFactory = $objectManager->get(\Magento\Indexer\Model\Indexer\CollectionFactory::class);
+$indexerCollection = $indexerCollectionFactory->create();
+$indexers = $indexerCollection->getItems();
+foreach ($indexers as $indexer) {
+    $indexer->reindexAll();
+}