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

- Adjusted reivew comments

Author: avattam06

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

@@ -42,7 +42,7 @@ public function testCacheInvalidationForProducts()
         // Cache should be a MISS when product is queried for first time
         $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
+        // Obtain the X-Magento-Cache-Id from the response
         $cacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);
@@ -108,7 +108,7 @@ public function testCacheInvalidationForCategoriesWithProduct()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProduct]
         );
 
-        // cache-debug header value should be MISS after  updating product1 and reloading the Category
+        // updating product1
         $firstProduct->setPrice(20);
         $productRepository->save($firstProduct);
 

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

@@ -33,9 +33,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]
@@ -94,27 +94,26 @@ public function testCacheIsInvalidatedOnBlockUpdate()
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
         );
 
+        //cache-debug should be a MISS after updating content on fixture block
         $newBlockContent = 'New block content!!!';
         $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 after update on the fixture block
-        $fixtureBlockHitResponse = $this->assertCacheMissAndReturnResponse(
+        // Verify we obtain a cache MISS update on the fixture block
+        $fixtureBlockMissResponse = $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 on the updated enabled block
-        $this->assertCacheHitAndReturnResponse(
+        //Verify we obtain a cache HIT on the enabled block query after the fixture block is updated
+        $enabledBlockHitResponse = $this->assertCacheHitAndReturnResponse(
             $enabledBlockQuery,
             [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
         );
 
+        $this->assertNotEmpty($enabledBlockHitResponse['body']);
         //updated block data should be correct on fixture block
-        $this->assertNotEmpty($fixtureBlockHitResponse['body']);
-        $blocks = $fixtureBlockHitResponse['body']['cmsBlocks']['items'];
-        $this->assertArrayNotHasKey('errors', $fixtureBlockHitResponse['body']);
+        $blocks = $fixtureBlockMissResponse['body']['cmsBlocks']['items'];
+        $this->assertArrayNotHasKey('errors', $fixtureBlockMissResponse['body']);
         $this->assertEquals($fixtureBlockIdentifier, $blocks[0]['identifier']);
         $this->assertEquals('CMS Block Title', $blocks[0]['title']);
         $this->assertEquals($newBlockContent, $blocks[0]['content']);

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

@@ -47,7 +47,7 @@ public function testCacheIsUsedOnSecondRequest()
 
         $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
+        // Obtain the X-Magento-Cache-Id from the response
         $cacheId = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time
         $this->assertCacheMissAndReturnResponse($query, [CacheIdCalculator::CACHE_ID_HEADER => $cacheId]);

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

@@ -29,7 +29,7 @@ public function testUrlResolverCachingForProducts()
         $urlKey = 'p002.html';
         $urlResolverQuery = $this->getUrlResolverQuery($urlKey);
 
-        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
+        // Obtain the X-Magento-Cache-Id from the response
         $response = $this->graphQlQueryWithResponseHeaders($urlResolverQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForProducts = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];
@@ -128,7 +128,7 @@ public function testCacheIsInvalidatedForUrlResolver()
         $urlKey = 'p002.html';
         $urlResolverQuery = $this->getUrlResolverQuery($urlKey);
 
-        // Obtain the X-Magento-Cache-Id from the response which will be used as the cache key
+        // Obtain the X-Magento-Cache-Id from the response
         $response = $this->graphQlQueryWithResponseHeaders($urlResolverQuery);
         $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $response['headers']);
         $cacheIdForUrlResolver = $response['headers'][CacheIdCalculator::CACHE_ID_HEADER];