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

- Added fixes  on CacheId

Author: avattam06

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

@@ -83,8 +83,6 @@ 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];
-        print_r("CacheId of CategoryQuery \n");
-        print_r($cacheIdOfCategoryQuery);
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheMissAndReturnResponse(
             $categoryQuery,
@@ -114,39 +112,24 @@ public function testCacheInvalidationForCategoriesWithProduct()
         $productRepository->save($firstProduct);
 
         // cache-debug header value should be MISS after  updating product1 and reloading the Category
-        $responseMissCategoryAfterProductUpdate = $this->graphQlQueryWithResponseHeaders($categoryQuery);
-        $this->assertArrayHasKey(
-            CacheIdCalculator::CACHE_ID_HEADER,
-            $responseMissCategoryAfterProductUpdate['headers']
-        );
-        $cacheIdOfCategoryAfterProductUpdate =
-            $responseMissCategoryAfterProductUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
-        print_r("CacheId of CategoryQuery After update \n");
-        print_r($cacheIdOfCategoryAfterProductUpdate );
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheMissAndReturnResponse(
             $categoryQuery,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfCategoryAfterProductUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfCategoryQuery]
         );
 
         // cache-debug should be a MISS for product 1 after it is updated - cache invalidation
-        $responseMissFirstProductAfterProductUpdate = $this->graphQlQueryWithResponseHeaders($product1Query);
-        $cacheIdOfFirstProductAfterProductUpdate =
-            $responseMissFirstProductAfterProductUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheMissAndReturnResponse(
             $product1Query,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFirstProductAfterProductUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFirstProduct]
         );
 
         // Cache-debug header responses for product 2 and should be a HIT for product 2
-        $responseHitSecondProduct = $this->graphQlQueryWithResponseHeaders($product2Query);
-        $cacheIdOfSecondProductOnHit =
-            $responseHitSecondProduct['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache HIT the second time around for this X-Magento-Cache-Id
         $this->assertCacheHitAndReturnResponse(
             $product2Query,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProductOnHit]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfSecondProduct]
         );
     }
 

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

@@ -98,23 +98,17 @@ public function testCacheIsInvalidatedOnBlockUpdate()
         $this->updateBlockContent($fixtureBlockIdentifier, $newBlockContent);
 
         //cache-debug should be a MISS after update the block on fixture block query
-        $fixtureBlockAfterUpdate = $this->graphQlQueryWithResponseHeaders($fixtureBlockQuery);
-        $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $fixtureBlock['headers']);
-        $cacheIdOfFixtureBlockAfterUpdate = $fixtureBlockAfterUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
         $fixtureBlockHitResponse = $this->assertCacheMissAndReturnResponse(
             $fixtureBlockQuery,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFixtureBlockAfterUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfFixtureBlock]
         );
 
         //cache-debug should be a HIT after update the block on enabled block query
-        $enabledBlockAfterUpdate = $this->graphQlQueryWithResponseHeaders($enabledBlockQuery);
-        $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $enabledBlock['headers']);
-        $cacheIdOfEnabledBlockAfterUpdate = $enabledBlockAfterUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache HIT the second time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheHitAndReturnResponse(
             $enabledBlockQuery,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlockAfterUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdOfEnabledBlock]
         );
 
         //updated block data should be correct on fixture block

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

@@ -119,22 +119,16 @@ public function testCacheIsInvalidatedOnPageUpdate()
 
         //cache-debug should be a MISS after updating the page
         $pageBlankResponseMissAfterUpdate = $this->graphQlQueryWithResponseHeaders($pageBlankQuery);
-        $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $pageBlankResponseMissAfterUpdate['headers']);
-        $cacheIdPageBlankResponseMissAfterUpdate =
-            $pageBlankResponseMissAfterUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         // Verify we obtain a cache MISS the first time we search the cache using this X-Magento-Cache-Id
         $this->assertCacheMissAndReturnResponse(
             $pageBlankQuery,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponseMissAfterUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPageBlankResponse]
         );
 
         $page100ResponseHitAfterUpdate = $this->graphQlQueryWithResponseHeaders($page100Query);
-        $this->assertArrayHasKey(CacheIdCalculator::CACHE_ID_HEADER, $page100ResponseHitAfterUpdate['headers']);
-        $cacheIdPage100ResponseHitAfterUpdate =
-            $page100ResponseHitAfterUpdate['headers'][CacheIdCalculator::CACHE_ID_HEADER];
         $this->assertCacheHitAndReturnResponse(
             $page100Query,
-            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPage100ResponseHitAfterUpdate]
+            [CacheIdCalculator::CACHE_ID_HEADER => $cacheIdPage100Response]
         );
 
         //updated page data should be correct