Query category for disabled catalog with products returns the products count

Author: XxXgeoXxX

app/code/Magento/CatalogGraphQl/Model/Resolver/CategoryTree.php

@@ -79,6 +79,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         $result = $this->extractDataFromCategoryTree->execute($categoriesTree);
-        return current($result);
+
+        $category = current($result);
+        if ($category['is_active'] == false) {
+            throw new GraphQlNoSuchEntityException(__('Category doesn\'t exist'));
+        }
+
+        return $category;
     }
 }

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

@@ -122,6 +122,25 @@ public function testGetCategoryById()
         self::assertEquals(13, $response['category']['id']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage Category doesn't exist
+     */
+    public function testGetDisabledCategory()
+    {
+        $categoryId = 8;
+        $query = <<<QUERY
+{
+  category(id: {$categoryId}) {
+      id
+      name
+  }
+}
+QUERY;
+        $this->graphQlQuery($query);
+    }
+
     public function testNonExistentCategoryWithProductCount()
     {
         $query = <<<QUERY