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

---
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 14 +------------
 .../Catalog/_files/categories_indexed.php     | 21 +++++++++++++++++++
 .../_files/categories_indexed_rollback.php    | 21 +++++++++++++++++++
 3 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index 8fc19a21421..d82b15e3990 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -115,23 +115,11 @@ public function testCategoriesTree()
 
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoApiDataFixture Magento/Catalog/_files/categories_indexed.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCategoryProducts()
     {
-        /** @var \Magento\Catalog\Model\Indexer\Category\Product\Processor $categoryProductIndexer */
-        $categoryProductIndexer = $this->objectManager->get(
-            \Magento\Catalog\Model\Indexer\Category\Product\Processor::class
-        );
-        $categoryProductIndexer->reindexAll();
-
-        /** @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor $inventoryIndexer */
-        $inventoryIndexer = $this->objectManager->get(
-            \Magento\CatalogInventory\Model\Indexer\Stock\Processor::class
-        );
-        $inventoryIndexer->reindexAll();
-
         $categoryId = 4;
         $query = <<<QUERY
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
new file mode 100644
index 00000000000..f7637097840
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+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();
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
new file mode 100644
index 00000000000..573fb7c3a2b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+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();