B2B-2451: Implement GraphQL Resolver Cache for CMS Page Type

Author: danmooney2

app/code/Magento/CmsGraphQl/Test/Integration/Model/Resolver/PageTest.php

@@ -185,6 +185,44 @@ public function testNeitherSaveNorLoadAreCalledWhenResolverCacheIsDisabled()
         $this->graphQlRequest->send($query);
     }
 
+    public function testSaveIsNeverCalledWhenMissingRequiredArgumentInQuery()
+    {
+        $objectManager = $this->objectManager;
+
+        $frontendPool = $objectManager->get(FrontendPool::class);
+
+        $cacheProxy = $this->getMockBuilder(GraphQlResolverCache::class)
+            ->enableProxyingToOriginalMethods()
+            ->setConstructorArgs([
+                $frontendPool
+            ])
+            ->getMock();
+
+        // assert cache proxy never calls save
+        $cacheProxy
+            ->expects($this->never())
+            ->method('save');
+
+        $resolverPluginWithCacheProxy = $objectManager->create(ResolverResultCachePlugin::class, [
+            'graphQlResolverCache' => $cacheProxy,
+        ]);
+
+        // override resolver plugin with plugin instance containing cache proxy class
+        $objectManager->addSharedInstance($resolverPluginWithCacheProxy, ResolverResultCachePlugin::class);
+
+        $query = <<<QUERY
+{
+  cmsPage {
+    title
+  }
+}
+QUERY;
+
+        // send request multiple times and assert save is never called
+        $this->graphQlRequest->send($query);
+        $this->graphQlRequest->send($query);
+    }
+
     private function getQuery(string $identifier, array $fields = ['title']): string
     {
         $fields = implode(PHP_EOL, $fields);

dev/tests/api-functional/testsuite/Magento/CmsGraphQl/Model/Resolver/PageTest.php

@@ -17,6 +17,7 @@
 use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\TestCase\GraphQl\ResponseContainsErrorsException;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
@@ -366,6 +367,34 @@ public function testCmsPageResolverCacheInvalidatesWhenPageGetsDisabled()
         );
     }
 
+    /**
+     * @magentoConfigFixture default/system/full_page_cache/caching_application 2
+     * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+     * @return void
+     */
+    public function testCmsPageResolverCacheDoesNotSaveNonExistentCmsPage()
+    {
+        $nonExistentPage = ObjectManager::getInstance()->create(PageInterface::class);
+        $nonExistentPage->setIdentifier('non-existent-page');
+
+        $query = $this->getQuery($nonExistentPage->getIdentifier());
+
+        try {
+            $response = $this->graphQlQueryWithResponseHeaders($query);
+            $this->fail('Expected exception was not thrown');
+        } catch (ResponseContainsErrorsException $e) {
+            // expected exception
+        }
+
+        $response['headers'] = $e->getResponseHeaders();
+
+        $cacheIdentityString = $this->getResolverCacheKeyFromResponseAndPage($response, $nonExistentPage);
+
+        $this->assertFalse(
+            $this->graphqlCache->load($cacheIdentityString)
+        );
+    }
+
     private function generateExpectedDataFromPage(PageInterface $page): array
     {
         return [