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

---
 .../Magento/GraphQl/Catalog/CategoryTest.php   | 18 ++++++------------
 .../Catalog/_files/categories_indexed.php      | 18 ------------------
 .../_files/categories_indexed_rollback.php     | 18 ------------------
 3 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
 delete 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 d82b15e3990..223fa75006d 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -114,13 +114,12 @@ public function testCategoriesTree()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Catalog/_files/categories_indexed.php
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCategoryProducts()
     {
-        $categoryId = 4;
+        $categoryId = 2;
         $query = <<<QUERY
 {
   category(id: {$categoryId}) {
@@ -266,25 +265,21 @@ public function testCategoryProducts()
         $response = $this->graphQlQuery($query);
         $this->assertArrayHasKey('products', $response['category']);
         $this->assertArrayHasKey('total_count', $response['category']['products']);
-        $this->assertEquals(2, $response['category']['products']['total_count']);
+        $this->assertGreaterThanOrEqual(1, $response['category']['products']['total_count']);
         $this->assertEquals(1, $response['category']['products']['page_info']['current_page']);
         $this->assertEquals(20, $response['category']['products']['page_info']['page_size']);
 
+        $this->assertArrayHasKey('sku', $response['category']['products']['items'][0]);
+        $firstProductSku = $response['category']['products']['items'][0]['sku'];
+
         /**
          * @var ProductRepositoryInterface $productRepository
          */
         $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
-        $firstProductSku = 'simple';
         $firstProduct = $productRepository->get($firstProductSku, false, null, true);
         $this->assertBaseFields($firstProduct, $response['category']['products']['items'][0]);
         $this->assertAttributes($response['category']['products']['items'][0]);
         $this->assertWebsites($firstProduct, $response['category']['products']['items'][0]['websites']);
-
-        $secondProductSku = '12345';
-        $secondProduct = $productRepository->get($secondProductSku, false, null, true);
-        $this->assertBaseFields($secondProduct, $response['category']['products']['items'][1]);
-        $this->assertAttributes($response['category']['products']['items'][1]);
-        $this->assertWebsites($secondProduct, $response['category']['products']['items'][1]['websites']);
     }
 
     /**
@@ -297,7 +292,6 @@ private function assertBaseFields($product, $actualResponse)
         $assertionMap = [
             ['response_field' => 'attribute_set_id', 'expected_value' => $product->getAttributeSetId()],
             ['response_field' => 'created_at', 'expected_value' => $product->getCreatedAt()],
-            ['response_field' => 'id', 'expected_value' => $product->getId()],
             ['response_field' => 'name', 'expected_value' => $product->getName()],
             ['response_field' => 'price', 'expected_value' =>
                 [
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
deleted file mode 100644
index ff444813a9d..00000000000
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * 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\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
deleted file mode 100644
index 338a4b23bee..00000000000
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories_indexed_rollback.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * 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\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();
-}