Merge branch 'MC-15986-story' of github.com:magento-honey-badgers/magento2ce into MC-15986-story

Author: danielrenaud

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

@@ -16,7 +16,6 @@
  */
 class CategoryListTest extends GraphQlAbstract
 {
-
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
      * @dataProvider filterSingleCategoryDataProvider
@@ -39,7 +38,6 @@ public function testFilterSingleCategoryByField($field, $condition, $value, $exp
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertCount(1, $result['categoryList']);
@@ -69,7 +67,6 @@ public function testFilterMultipleCategoriesByField($field, $condition, $value,
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertCount(count($expectedResult), $result['categoryList']);
@@ -96,7 +93,6 @@ public function testFilterCategoryByMultipleFields()
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertCount(3, $result['categoryList']);
@@ -121,7 +117,6 @@ public function testFilterWithInactiveCategory()
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertCount(1, $result['categoryList']);
@@ -168,9 +163,7 @@ public function testQueryChildCategoriesWithProducts()
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
-        $a = 3;
 
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertCount(1, $result['categoryList']);
@@ -234,7 +227,6 @@ public function testNoResultsFound()
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertArrayHasKey('categoryList', $result);
@@ -261,7 +253,6 @@ public function testEmptyFiltersReturnRootCategory()
     }
 }
 QUERY;
-
         $storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $storeRootCategoryId = $storeManager->getStore()->getRootCategoryId();
 
@@ -292,7 +283,6 @@ public function testMinimumMatchQueryLength()
     }
 }
 QUERY;
-
         $result = $this->graphQlQuery($query);
         $this->assertArrayNotHasKey('errors', $result);
         $this->assertArrayHasKey('categoryList', $result);
@@ -351,6 +341,7 @@ public function filterSingleCategoryDataProvider(): array
     }
 
     /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @return array
      */
     public function filterMultipleCategoriesDataProvider(): array

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryListCacheTest.php

@@ -99,10 +99,12 @@ public function testRequestCacheTagsForCategoryListOnMultipleIds(): void
            }
        }
 QUERY;
+        //added the previous category in expected tags as it is cached
+        $expectedCacheTags = ['cat_c','cat_c_' .'333', 'cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
+
         $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
-        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
         $this->assertEquals($expectedCacheTags, $actualCacheTags);
     }
 
@@ -127,7 +129,8 @@ public function testSecondRequestIsServedFromCacheOnMultipleIds()
            }
        }
 QUERY;
-        $expectedCacheTags = ['cat_c','cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
+        //added the previous category in expected tags as it is cached
+        $expectedCacheTags = ['cat_c','cat_c_' .'333', 'cat_c_' . $categoryId1, 'cat_c_' . $categoryId2, 'FPC'];
 
         $response = $this->dispatchGraphQlGETRequest(['query' => $query]);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());