ENGCOM-4463: GraphQL-360: Unskip and fix testGetSimpleProductsFromCategory #457

Author: naydav

app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php

@@ -90,14 +90,17 @@ public function __construct(
      */
     public function addParentProduct(Product $product) : void
     {
-        if (isset($this->parentProducts[$product->getId()])) {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $productId = $product->getData($linkField);
+
+        if (isset($this->parentProducts[$productId])) {
             return;
         }
 
         if (!empty($this->childrenMap)) {
             $this->childrenMap = [];
         }
-        $this->parentProducts[$product->getId()] = $product;
+        $this->parentProducts[$productId] = $product;
     }
 
     /**
@@ -140,16 +143,12 @@ private function fetch() : array
             return $this->childrenMap;
         }
 
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         foreach ($this->parentProducts as $product) {
             $attributeData = $this->getAttributesCodes($product);
             /** @var ChildCollection $childCollection */
             $childCollection = $this->childCollectionFactory->create();
-            $childCollection->addAttributeToSelect($attributeData);
-
-            /** @var Product $product */
-            $product->setData($linkField, $product->getId());
             $childCollection->setProductFilter($product);
+            $childCollection->addAttributeToSelect($attributeData);
 
             /** @var Product $childProduct */
             foreach ($childCollection->getItems() as $childProduct) {

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

@@ -18,14 +18,11 @@
 class CategoryProductsVariantsTest extends GraphQlAbstract
 {
     /**
-     *
      * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function testGetSimpleProductsFromCategory()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/360');
-
         $query
             = <<<QUERY
 {

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

@@ -28,7 +28,6 @@ protected function setUp()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -70,14 +69,7 @@ public function testCategoriesTree()
     }
 }
 QUERY;
-        // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
+        $response = $this->graphQlQuery($query);
         $responseDataObject = new DataObject($response);
         //Some sort of smoke testing
         self::assertEquals(
@@ -111,39 +103,22 @@ public function testCategoriesTree()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testGetCategoryById()
     {
-        $rootCategoryId = 13;
+        $categoryId = 13;
         $query = <<<QUERY
 {
-  category(id: {$rootCategoryId}) {
+  category(id: {$categoryId}) {
       id
       name
   }
 }
 QUERY;
-        // get customer ID token
-        /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        $customerTokenService = $this->objectManager->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
-        $customerToken = $customerTokenService->createCustomerAccessToken('customer@example.com', 'password');
-        $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
-        $response = $this->graphQlQuery($query, [], '', $headerMap);
-        $responseDataObject = new DataObject($response);
-        //Some sort of smoke testing
-        self::assertEquals(
-            'Category 1.2',
-            $responseDataObject->getData('category/name')
-        );
-        self::assertEquals(
-            13,
-            $responseDataObject->getData('category/id')
-        );
+        $response = $this->graphQlQuery($query);
+        self::assertEquals('Category 1.2', $response['category']['name']);
+        self::assertEquals(13, $response['category']['id']);
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductViewTest.php

@@ -28,8 +28,6 @@ class ConfigurableProductViewTest extends GraphQlAbstract
      */
     public function testQueryConfigurableProductLinks()
     {
-        $this->markTestIncomplete('https://github.com/magento/graphql-ce/issues/361');
-
         $productSku = 'configurable';
 
         $query