Issue-230: adding varnish

- fixing dispatch tests

Author: cpartica

dev/tests/integration/testsuite/Magento/Framework/GraphQl/Config/GraphQlReaderTest.php

@@ -187,11 +187,7 @@ enumValues(includeDeprecated: true) {
             ->addHeaders(['Content-Type' => 'application/json']);
         $request->setHeaders($headers);
 
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->create(\Magento\Framework\App\Response\Http::class);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphQlController->dispatch($request);
-        $result->renderResult($response);
+        $response = $this->graphQlController->dispatch($request);
         $output = $this->jsonSerializer->unserialize($response->getContent());
         $expectedOutput = require __DIR__ . '/../_files/schema_response_sdl_description.php';
 

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoriesWithProductsCacheTest.php

@@ -94,11 +94,7 @@ public function testToCheckRequestCacheTagsForCategoryWithProducts(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setParams($queryParams);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphqlController->dispatch($this->request);
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $expectedCacheTags = ['cat_c','cat_c_' . $categoryId,'cat_p','cat_p_' . $product->getId(),'FPC'];
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/CategoryCacheTest.php

@@ -62,12 +62,7 @@ public function testToCheckRequestCacheTagsForForCategory(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $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 */
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $expectedCacheTags = ['cat_c','cat_c_' . $categoryId,'FPC'];

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/DeepNestedCategoriesAndProductsTest.php

@@ -115,11 +115,7 @@ public function testDispatchForCacheHeadersOnDeepNestedQueries(): void
         $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);
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        $result->renderResult($response);
+        $response = $this->graphql->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $this->assertEmpty(

dev/tests/integration/testsuite/Magento/GraphQlCache/Controller/Catalog/ProductsCacheTest.php

@@ -74,12 +74,7 @@ public function testToCheckRequestCacheTagsForProducts(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $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 */
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $expectedCacheTags = ['cat_p', 'cat_p_' . $product->getId(), 'FPC'];
@@ -111,11 +106,7 @@ public function testToCheckRequestNoTagsForProducts(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphqlController->dispatch($this->request);
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $actualCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $expectedCacheTags = ['FPC'];

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

@@ -68,11 +68,7 @@ public function testCmsBlocksRequestHasCorrectTags(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphqlController->dispatch($this->request);
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $expectedCacheTags = ['cms_b', 'cms_b_' . $block->getId(), 'cms_b_' . $block->getIdentifier(), 'FPC'];
         $rawActualCacheTags = $response->getHeader('X-Magento-Tags')->getFieldValue();

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

@@ -71,11 +71,7 @@ public function testToCheckCmsPageRequestCacheTags(): void
         $this->request->setPathInfo('/graphql');
         $this->request->setMethod('GET');
         $this->request->setQueryValue('query', $query);
-        /** @var \Magento\Framework\Controller\Result\Json $result */
-        $result = $this->graphqlController->dispatch($this->request);
-        /** @var \Magento\Framework\App\Response\Http $response */
-        $response = $this->objectManager->get(\Magento\Framework\App\Response\Http::class);
-        $result->renderResult($response);
+        $response = $this->graphqlController->dispatch($this->request);
         $this->assertEquals('MISS', $response->getHeader('X-Magento-Cache-Debug')->getFieldValue());
         $requestedCacheTags = explode(',', $response->getHeader('X-Magento-Tags')->getFieldValue());
         $expectedCacheTags = ['cms_p', 'cms_p_' .$pageId , 'FPC'];