B2B-2530: Unskip GraphQL cache tests skipped due to DEVOPS-4924

avattam06 · avattam06 · commit 604c02bb8e9b · 2023-04-25T15:42:01.000-05:00
- Added fixes on comments
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php
@@ -93,7 +93,7 @@ public function testCacheInvalidationForCategoriesWithProduct()
         $responseFirstProduct = $this->graphQlQueryWithResponseHeaders($product1Query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $responseFirstProduct['headers']);
         $cacheIdOfFirstProduct = $responseFirstProduct['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS on the first product
         $this->assertCacheMissAndReturnResponse(
             $product1Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFirstProduct]
@@ -112,21 +112,21 @@ public function testCacheInvalidationForCategoriesWithProduct()
         $productRepository->save($firstProduct);
 
         // cache-debug header value should be MISS after  updating product1 and reloading the Category
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS after the first product update and category reloading
         $this->assertCacheMissAndReturnResponse(
             $categoryQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfCategoryQuery]
         );
 
         // cache-debug should be a MISS for product 1 after it is updated - cache invalidation
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS after the first product update
         $this->assertCacheMissAndReturnResponse(
             $product1Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFirstProduct]
         );
 
         // Cache-debug header responses for product 2 and should be a HIT for product 2
-        // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT on the second product after updates
         $this->assertCacheHitAndReturnResponse(
             $product2Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProduct]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/BlockCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/BlockCacheTest.php
@@ -67,7 +67,7 @@ public function testCacheIsInvalidatedOnBlockUpdate()
         $fixtureBlock = $this->graphQlQueryWithResponseHeaders($fixtureBlockQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $fixtureBlock['headers']);
         $cacheIdOfFixtureBlock = $fixtureBlock['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $fixtureBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFixtureBlock]
@@ -76,19 +76,19 @@ public function testCacheIsInvalidatedOnBlockUpdate()
         $enabledBlock = $this->graphQlQueryWithResponseHeaders($enabledBlockQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $enabledBlock['headers']);
         $cacheIdOfEnabledBlock = $enabledBlock['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $enabledBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
         );
 
         //cache should be a HIT on second request
-        // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $this->assertCacheHitAndReturnResponse(
             $fixtureBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFixtureBlock]
         );
-        // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $this->assertCacheHitAndReturnResponse(
             $enabledBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
@@ -98,14 +98,14 @@ public function testCacheIsInvalidatedOnBlockUpdate()
         $this->updateBlockContent($fixtureBlockIdentifier, $newBlockContent);
 
         //cache-debug should be a MISS after update the block on fixture block query
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time after update on the fixture block
         $fixtureBlockHitResponse = $this->assertCacheMissAndReturnResponse(
             $fixtureBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFixtureBlock]
         );
 
         //cache-debug should be a HIT after update the block on enabled block query
-        // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time on the updated enabled block
         $this->assertCacheHitAndReturnResponse(
             $enabledBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php
@@ -49,9 +49,9 @@ public function testCacheIsUsedOnSecondRequest()
         $response = $this->graphQlQueryWithResponseHeaders($query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
-        // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $responseHit = $this->assertCacheHitAndReturnResponse(
             $query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]
@@ -86,7 +86,7 @@ public function testCacheIsInvalidatedOnPageUpdate()
         $page100Response = $this->graphQlQueryWithResponseHeaders($page100Query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $page100Response['headers']);
         $cacheIdPage100Response = $page100Response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $page100Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPage100Response]
@@ -95,7 +95,7 @@ public function testCacheIsInvalidatedOnPageUpdate()
         $pageBlankResponse = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $pageBlankResponse['headers']);
         $cacheIdPageBlankResponse = $pageBlankResponse['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $pageBlankQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
@@ -119,7 +119,7 @@ public function testCacheIsInvalidatedOnPageUpdate()
 
         //cache-debug should be a MISS after updating the page
         $pageBlankResponseMissAfterUpdate = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS after updating the page
         $this->assertCacheMissAndReturnResponse(
             $pageBlankQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Quote/Guest/CartCacheTest.php
@@ -35,12 +35,11 @@ public function testCartIsNotCached()
         $this->assertArrayHasKey('items', $responseMiss['body']['cart']);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $responseMiss['headers']);
         $cacheId = $responseMiss['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse($getCartQuery, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
 
         // Cache debug header value is still a MISS for any subsequent request
-        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
-        // Verify we obtain a cache MISS the second time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the second time
         $this->assertCacheMissAndReturnResponse($getCartQuery, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/UrlRewrite/UrlResolverCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/UrlRewrite/UrlResolverCacheTest.php
@@ -33,12 +33,12 @@ public function testUrlResolverCachingForProducts()
         $response = $this->graphQlQueryWithResponseHeaders($urlResolverQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForProducts = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $urlResolverQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForProducts]
         );
-        // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $cachedResponse = $this->assertCacheHitAndReturnResponse(
             $urlResolverQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForProducts]
@@ -64,12 +64,12 @@ public function testUrlResolverCachingForCategory()
         $response = $this->graphQlQueryWithResponseHeaders($query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForCategory = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForCategory]
         );
-        // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $cachedResponse = $this->assertCacheHitAndReturnResponse(
             $query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForCategory]
@@ -98,12 +98,12 @@ public function testUrlResolverCachingForCMSPage()
         $response = $this->graphQlQueryWithResponseHeaders($query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForCmsPage = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForCmsPage]
         );
-        // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $cachedResponse = $this->assertCacheHitAndReturnResponse(
             $query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForCmsPage]
@@ -132,12 +132,12 @@ public function testCacheIsInvalidatedForUrlResolver()
         $response = $this->graphQlQueryWithResponseHeaders($urlResolverQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForUrlResolver = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
+        // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse(
             $urlResolverQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForUrlResolver]
         );
-        // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time 
         $this->assertCacheHitAndReturnResponse(
             $urlResolverQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForUrlResolver]
