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

- Adjusted the comments as per review

Author: avattam06

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php

@@ -40,13 +40,13 @@ public function testCacheInvalidationForProducts()
        }
 QUERY;
         // Cache should be a MISS when product is queried for first time
-        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
         $response = $this->graphQlQueryWithResponseHeaders($query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
+        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
         $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 around for this X-Magento-Cache-Id
+        // Verify we obtain a cache HIT the second time
         $this->assertCacheHitAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
 
         /** @var ProductRepositoryInterface $productRepository */
@@ -83,7 +83,7 @@ public function testCacheInvalidationForCategoriesWithProduct()
         // cache-debug header value should be a MISS when category is loaded first time
         $responseMissOnCategoryQuery = $this->graphQlQueryWithResponseHeaders($categoryQuery);
         $cacheIdOfCategoryQuery = $responseMissOnCategoryQuery['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(
             $categoryQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfCategoryQuery]
@@ -108,10 +108,10 @@ public function testCacheInvalidationForCategoriesWithProduct()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProduct]
         );
 
+        // cache-debug header value should be MISS after  updating product1 and reloading the Category
         $firstProduct->setPrice(20);
         $productRepository->save($firstProduct);
 
-        // cache-debug header value should be MISS after  updating product1 and reloading the Category
         // Verify we obtain a cache MISS after the first product update and category reloading
         $this->assertCacheMissAndReturnResponse(
             $categoryQuery,
@@ -126,7 +126,7 @@ public function testCacheInvalidationForCategoriesWithProduct()
         );
 
         // Cache-debug header responses for product 2 and should be a HIT for product 2
-        // Verify we obtain a cache HIT on the second product after updates
+        // Verify we obtain a cache HIT on the second product after update
         $this->assertCacheHitAndReturnResponse(
             $product2Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProduct]

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/Cms/PageCacheTest.php

@@ -45,9 +45,10 @@ public function testCacheIsUsedOnSecondRequest()
 
         $query = $this->getPageQuery($pageId);
 
-        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
+
         $response = $this->graphQlQueryWithResponseHeaders($query);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
+        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
         $cacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
@@ -101,37 +102,44 @@ public function testCacheIsInvalidatedOnPageUpdate()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
         );
 
-        //cache-debug should be a HIT on second request
+        //cache-debug should be a HIT on second request for page100 query
         $this->assertCacheHitAndReturnResponse(
             $page100Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPage100Response]
         );
-        //cache-debug should be a HIT on second request
+        //cache-debug should be a HIT on second request for page blank query
         $this->assertCacheHitAndReturnResponse(
             $pageBlankQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
         );
 
+        //cache-debug should be a MISS after updating the blank page
         $pageRepository = Bootstrap::getObjectManager()->get(PageRepository::class);
         $newPageContent = 'New page content for blank page.';
         $pageBlank->setContent($newPageContent);
         $pageRepository->save($pageBlank);
 
-        //cache-debug should be a MISS after updating the page
+
         $pageBlankResponseMissAfterUpdate = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-        // Verify we obtain a cache MISS after updating the page
+        // Verify we obtain a cache MISS after updating the page blank query
         $this->assertCacheMissAndReturnResponse(
             $pageBlankQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
         );
 
+        $pageBlankResponseHitAfterUpdate = $this->assertCacheHitAndReturnResponse(
+            $pageBlankQuery,
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
+        );
+
+        // Verify we obtain a cache Hit after updating the page on page 100 query
         $this->assertCacheHitAndReturnResponse(
             $page100Query,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPage100Response]
         );
 
-        //updated page data should be correct
-        $this->assertNotEmpty($pageBlankResponseMissAfterUpdate['body']);
+        //updated page data should be correct for blank page
+        $this->assertNotEmpty($pageBlankResponseHitAfterUpdate['body']);
         $pageData = $pageBlankResponseMissAfterUpdate['body']['cmsPage'];
         $this->assertArrayNotHasKey('errors', $pageBlankResponseMissAfterUpdate['body']);
         $this->assertEquals('Cms Page Design Blank', $pageData['title']);

dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/UrlRewrite/UrlResolverCacheTest.php

@@ -143,6 +143,7 @@ public function testCacheIsInvalidatedForUrlResolver()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdForUrlResolver]
         );
 
+        //Updating the product url key
         /** @var ProductRepositoryInterface $productRepository */
         $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
         /** @var Product $product */