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

avattam06 · avattam06 · commit 28de9988a13c · 2023-04-20T11:07:48.000-05:00
- Fixed comments on the tests
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/CacheTagTest.php
@@ -13,17 +13,17 @@
 use Magento\TestFramework\ObjectManager;
 
 /**
- * Test the caching works properly for products and categories
+ * Test the cache invalidation for products and categories
  */
 class CacheTagTest extends GraphQLPageCacheAbstract
 {
     /**
-     * Test if Magento debug headers for products are generated properly
+     * Test if cache invalidation for products
      *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      * @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
      */
-    public function testCacheHeaderForProducts()
+    public function testCacheInvalidationForProducts()
     {
         $productSku='simple2';
         $query
@@ -64,14 +64,12 @@ public function testCacheHeaderForProducts()
     }
 
     /**
-     * Test if cache for categories are generated properly
-     *
-     * Also tests the use case for cache invalidation
+     * Test if cache is invalidated properly for categories
      *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      * @magentoApiDataFixture Magento/Catalog/_files/product_in_multiple_categories.php
      */
-    public function testCacheHeaderForCategoriesWithProduct()
+    public function testCacheInvalidationForCategoriesWithProduct()
     {
         $firstProductSku = 'simple333';
         $secondProductSku = 'simple444';
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
@@ -14,7 +14,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Test the caching works properly for CMS Blocks
+ * Test the cache invalidation for CMS Blocks
  */
 class BlockCacheTest extends GraphQLPageCacheAbstract
 {
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
@@ -14,7 +14,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Test the caching works properly for CMS Pages
+ * Test the cache invalidation for CMS Pages
  */
 class PageCacheTest extends GraphQLPageCacheAbstract
 {
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
@@ -18,6 +18,8 @@
 class CartCacheTest extends GraphQLPageCacheAbstract
 {
     /**
+     * Check if the cart is not cached
+     *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      */
     public function testCartIsNotCached()
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
@@ -14,17 +14,17 @@
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
- * Test caching works for url resolver.
+ * Test cache invalidation for url resolver.
  */
 class UrlResolverCacheTest extends GraphQLPageCacheAbstract
 {
     /**
-     * Tests cache debug headers are correct for product urlResolver
+     * Tests cache invalidation for product urlResolver
      *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
-    public function testCacheTagsForProducts()
+    public function testUrlResolverCachingForProducts()
     {
         $urlKey = 'p002.html';
         $urlResolverQuery = $this->getUrlResolverQuery($urlKey);
@@ -47,12 +47,12 @@ public function testCacheTagsForProducts()
     }
 
     /**
-     * Tests cache debug headers are correct for category urlResolver
+     * Tests cache invalidation for category urlResolver
      *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      * @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php
      */
-    public function testCacheTagsForCategory()
+    public function testUrlResolverCachingForCategory()
     {
         $categoryUrlKey = 'cat-1.html';
         $query = $this->getUrlResolverQuery($categoryUrlKey);
@@ -75,7 +75,7 @@ public function testCacheTagsForCategory()
     }
 
     /**
-     * Test Cache debug headers are correct for cms page url resolver
+     * Test cache invalidation for cms page url resolver
      *
      * @magentoConfigFixture default/system/full_page_cache/caching_application 2
      * @magentoApiDataFixture Magento/Cms/_files/pages.php

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use Magento\TestFramework\Helper\Bootstrap;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * Test the caching works properly for CMS Blocks`
	`17`	`+ * Test the cache invalidation for CMS Blocks`
`18`	`18`	`*/`
`19`	`19`	`class BlockCacheTest extends GraphQLPageCacheAbstract`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`class CartCacheTest extends GraphQLPageCacheAbstract`
`19`	`19`	`{`
`20`	`20`	`/**`
	`21`	`+ * Check if the cart is not cached`
	`22`	`+ *`
`21`	`23`	`* @magentoConfigFixture default/system/full_page_cache/caching_application 2`
`22`	`24`	`*/`
`23`	`25`	`public function testCartIsNotCached()`
Original file line number	Diff line number	Diff line change
`@@ -14,17 +14,17 @@`
`14`	`14`	`use Magento\TestFramework\Helper\Bootstrap;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * Test caching works for url resolver.`
	`17`	`+ * Test cache invalidation for url resolver.`
`18`	`18`	`*/`
`19`	`19`	`class UrlResolverCacheTest extends GraphQLPageCacheAbstract`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * Tests cache debug headers are correct for product urlResolver`
	`22`	`+ * Tests cache invalidation for product urlResolver`
`23`	`23`	`*`
`24`	`24`	`* @magentoConfigFixture default/system/full_page_cache/caching_application 2`
`25`	`25`	`* @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php`
`26`	`26`	`*/`
`27`		`- public function testCacheTagsForProducts()`
	`27`	`+ public function testUrlResolverCachingForProducts()`
`28`	`28`	`{`
`29`	`29`	`$urlKey = 'p002.html';`
`30`	`30`	`$urlResolverQuery = $this->getUrlResolverQuery($urlKey);`
`@@ -47,12 +47,12 @@ public function testCacheTagsForProducts()`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`/**`
`50`		`- * Tests cache debug headers are correct for category urlResolver`
	`50`	`+ * Tests cache invalidation for category urlResolver`
`51`	`51`	`*`
`52`	`52`	`* @magentoConfigFixture default/system/full_page_cache/caching_application 2`
`53`	`53`	`* @magentoApiDataFixture Magento/CatalogUrlRewrite/_files/product_with_category.php`
`54`	`54`	`*/`
`55`		`- public function testCacheTagsForCategory()`
	`55`	`+ public function testUrlResolverCachingForCategory()`
`56`	`56`	`{`
`57`	`57`	`$categoryUrlKey = 'cat-1.html';`
`58`	`58`	`$query = $this->getUrlResolverQuery($categoryUrlKey);`
`@@ -75,7 +75,7 @@ public function testCacheTagsForCategory()`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`78`		`- * Test Cache debug headers are correct for cms page url resolver`
	`78`	`+ * Test cache invalidation for cms page url resolver`
`79`	`79`	`*`
`80`	`80`	`* @magentoConfigFixture default/system/full_page_cache/caching_application 2`
`81`	`81`	`* @magentoApiDataFixture Magento/Cms/_files/pages.php`