Merge branch 'graphql-issue-230' of github.com:magento-honey-badgers/magento2ce into graphql-issue-230

Author: dthampy

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Cms/CmsPageCacheTest.php

@@ -9,70 +9,43 @@
 
 use Magento\Cms\Model\GetPageByIdentifier;
 use Magento\Framework\App\Request\Http;
-use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\GraphQl\Controller\GraphQl;
+use Magento\GraphQlCache\Controller\AbstractGraphqlCacheTest;
 
 /**
  * Test caching works for CMS page
  *
  * @magentoAppArea graphql
- * @magentoDbIsolation disabled
+ * @magentoCache full_page enabled
  */
-class CmsPageCacheTest extends \Magento\TestFramework\Indexer\TestCase
+class CmsPageCacheTest extends AbstractGraphqlCacheTest
 {
-    const CONTENT_TYPE = 'application/json';
-
-    /** @var \Magento\Framework\ObjectManagerInterface */
-    private $objectManager;
-
-    /** @var GraphQl */
-    private $graphql;
-
-    /** @var SerializerInterface */
-    private $jsonSerializer;
-
-    /** @var MetadataPool */
-    private $metadataPool;
-
-    /** @var Http */
-    private $request;
-
     /**
-     * @inheritdoc
+     * @var GraphQl
      */
-    public static function setUpBeforeClass()
-    {
-        $db = Bootstrap::getInstance()->getBootstrap()
-            ->getApplication()
-            ->getDbInstance();
-        if (!$db->isDbDumpExists()) {
-            throw new \LogicException('DB dump does not exist.');
-        }
-        $db->restoreFromDbDump();
+    private $graphqlController;
 
-        parent::setUpBeforeClass();
-    }
+    /**
+     * @var Http
+     */
+    private $request;
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->graphql = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
-        $this->jsonSerializer = $this->objectManager->get(SerializerInterface::class);
-        $this->metadataPool = $this->objectManager->get(MetadataPool::class);
-        $this->request = $this->objectManager->get(Http::class);
+        parent::setUp();
+        $this->graphqlController = $this->objectManager->get(\Magento\GraphQl\Controller\GraphQl::class);
+        $this->request = $this->objectManager->create(Http::class);
     }
+
     /**
-     * Test cache tags and debug header for category and querying only cms page
+     * Test that the correct cache tags get added to request for cmsPage query
      *
-     * @magentoCache all enabled
      * @magentoDataFixture Magento/Cms/_files/pages.php
      */
-    public function testDispatchWithGetForCacheDebugHeadersAndCacheTagsForCmsPage(): void
+    public function testToCheckCmsPageRequestCacheTags(): void
     {
         $cmsPage = $this->objectManager->get(GetPageByIdentifier::class)->execute('page100', 0);
         $pageId = $cmsPage->getId();
@@ -92,20 +65,18 @@ public function testDispatchWithGetForCacheDebugHeadersAndCacheTagsForCmsPage():
                    }
          }
 QUERY;
+
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
         /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphql->dispatch($this->request);
+        $result = $this->graphqlController->dispatch($this->request);
         /** @var \Magento\Framework\App\Response\Http $response */
         $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        /** @var  $registry \Magento\Framework\Registry */
-        $registry = $this->objectManager->get(\Magento\Framework\Registry::class);
-        $registry->register('use_page_cache_plugin', true, true);
         $result->renderResult($response);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
-        $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
+        $requestedCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $expectedCacheTags = ['cms_p', 'cms_p_' .$pageId , 'FPC'];
-        $this->assertEquals($expectedCacheTags, $actualCacheTags);
+        $this->assertEquals($expectedCacheTags, $requestedCacheTags);
     }
 }