MAGETWO-91388: Enable caching of AJAX requests on Varnish/Fastly

Author: slopukhov

app/code/Magento/Swatches/Controller/Ajax/Media.php

@@ -12,7 +12,7 @@
 /**
  * Class Media
  */
-class Media extends \Magento\Framework\App\Action\Action
+class Media extends \Magento\Framework\App\Action\Action implements \Magento\Framework\App\Action\HttpGetActionInterface
 {
     /**
      * @var \Magento\Catalog\Model\Product Factory

app/code/Magento/Swatches/Test/Unit/Controller/Ajax/MediaTest.php

@@ -20,6 +20,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Catalog\Model\ProductFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $productModelFactoryMock;
 
+    /** @var \Magento\PageCache\Model\Config|\PHPUnit_Framework_MockObject_MockObject */
+    private $config;
+
     /** @var \Magento\Catalog\Model\Product|\PHPUnit_Framework_MockObject_MockObject */
     private $productMock;
 
@@ -29,6 +32,9 @@ class MediaTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $requestMock;
 
+    /** @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $responseMock;
+
     /** @var \Magento\Framework\Controller\ResultFactory|\PHPUnit_Framework_MockObject_MockObject */
     private $resultFactory;
 
@@ -57,11 +63,20 @@ protected function setUp()
             \Magento\Catalog\Model\ProductFactory::class,
             ['create']
         );
+        $this->config = $this->createMock(\Magento\PageCache\Model\Config::class);
+        $this->config->method('getTtl')->willReturn(1);
+
         $this->productMock = $this->createMock(\Magento\Catalog\Model\Product::class);
         $this->contextMock = $this->createMock(\Magento\Framework\App\Action\Context::class);
 
         $this->requestMock = $this->createMock(\Magento\Framework\App\RequestInterface::class);
         $this->contextMock->method('getRequest')->willReturn($this->requestMock);
+        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['setPublicHeaders'])
+            ->getMockForAbstractClass();
+        $this->responseMock->method('setPublicHeaders')->willReturnSelf();
+        $this->contextMock->method('getResponse')->willReturn($this->responseMock);
         $this->resultFactory = $this->createPartialMock(\Magento\Framework\Controller\ResultFactory::class, ['create']);
         $this->contextMock->method('getResultFactory')->willReturn($this->resultFactory);
 
@@ -73,7 +88,8 @@ protected function setUp()
             [
                 'context' => $this->contextMock,
                 'swatchHelper' => $this->swatchHelperMock,
-                'productModelFactory' => $this->productModelFactoryMock
+                'productModelFactory' => $this->productModelFactoryMock,
+                'config' => $this->config
             ]
         );
     }
@@ -86,6 +102,10 @@ public function testExecute()
             ->method('load')
             ->with(59)
             ->willReturn($this->productMock);
+        $this->productMock
+            ->expects($this->once())
+            ->method('getIdentities')
+            ->willReturn(['tags']);
 
         $this->productModelFactoryMock
             ->expects($this->once())

app/code/Magento/Swatches/composer.json

@@ -13,6 +13,7 @@
         "magento/module-configurable-product": "*",
         "magento/module-customer": "*",
         "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
         "magento/module-media-storage": "*",
         "magento/module-store": "*",
         "magento/module-theme": "*"