MC-21542: Category query does not handle disabled children properly

- add test

Author: cpartica

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryListTest.php

@@ -209,6 +209,79 @@ public function testQueryChildCategoriesWithProducts()
         $this->assertCategoryChildren($secondChildCategory, $firstChildCategoryChildren);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories_disabled.php
+     */
+    public function testQueryChildCategoriesWithProductsDisabled()
+    {
+        $query =  <<<QUERY
+{
+    categoryList(filters: {ids: {in: ["3"]}}){
+        id
+        name
+        url_key
+        url_path
+        description
+        products{
+          total_count
+          items{
+            name
+            sku
+          }
+        }
+        children{
+          name
+          url_key
+          description
+          products{
+            total_count
+            items{
+              name
+              sku
+            }
+          }
+          children{
+            name
+          }
+        }
+    }
+}
+QUERY;
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertCount(1, $result['categoryList']);
+        $baseCategory = $result['categoryList'][0];
+
+        $this->assertEquals('Category 1', $baseCategory['name']);
+        $this->assertArrayHasKey('products', $baseCategory);
+        //Check base category products
+        $expectedBaseCategoryProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => '12345', 'name' => 'Simple Product Two'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($baseCategory, $expectedBaseCategoryProducts);
+        //Check base category children
+        $expectedBaseCategoryChildren = [
+            ['name' => 'Category 1.2', 'description' => 'Its a description of Test Category 1.2']
+        ];
+        $this->assertCategoryChildren($baseCategory, $expectedBaseCategoryChildren);
+
+        //Check first child category
+        $firstChildCategory = $baseCategory['children'][0];
+        $this->assertEquals('Category 1.2', $firstChildCategory['name']);
+        $this->assertEquals('Its a description of Test Category 1.2', $firstChildCategory['description']);
+
+        $firstChildCategoryExpectedProducts = [
+            ['sku' => 'simple', 'name' => 'Simple Product'],
+            ['sku' => 'simple-4', 'name' => 'Simple Product Three']
+        ];
+        $this->assertCategoryProducts($firstChildCategory, $firstChildCategoryExpectedProducts);
+        $firstChildCategoryChildren = [];
+        $this->assertCategoryChildren($firstChildCategory, $firstChildCategoryChildren);
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      */

dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled.php

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/categories.php';
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $category \Magento\Catalog\Model\Category */
+$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+
+$category->load(4);
+$category->setIsActive(false);
+$category->save();

dev/tests/integration/testsuite/Magento/Catalog/_files/categories_disabled_rollback.php

@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/categories_rollback.php';