Merge pull request #654 from magento-extensibility/MAGETWO-43258-wrong-links-on-multi-website-store

Magetwo 43258 wrong links on multi website store

Author: He, Joan(johe)

app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php

@@ -19,6 +19,9 @@ class HttpPlugin
      */
     public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject)
     {
+        if ($subject instanceof \Magento\MediaStorage\Model\File\Storage\Response) {
+            return;
+        }
         $subject->sendVary();
     }
 }

app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php

@@ -12,14 +12,27 @@
 
 class HttpPluginTest extends \PHPUnit_Framework_TestCase
 {
-    public function testBeforeSendResponse()
+    /**
+     * @param \Magento\Framework\App\Response\FileInterface $responseInstanceClass
+     * @param int $sendVaryCalled
+     *
+     * @dataProvider beforeSendResponseDataProvider
+     */
+    public function testBeforeSendResponse($responseInstanceClass, $sendVaryCalled)
     {
-        /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject $responseMock */
-        $responseMock = $this->getMockBuilder('Magento\Framework\App\Response\Http')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $responseMock->expects($this->once())->method('sendVary');
+        /** @var \Magento\Framework\App\Response\Http | \PHPUnit_Framework_MockObject_MockObject $responseMock */
+        $responseMock = $this->getMock($responseInstanceClass, [], [], '', false);
+        $responseMock->expects($this->exactly($sendVaryCalled))
+            ->method('sendVary');
         $plugin = new HttpPlugin();
         $plugin->beforeSendResponse($responseMock);
     }
+
+    public function beforeSendResponseDataProvider()
+    {
+        return [
+            ['Magento\Framework\App\Response\Http', 1],
+            ['Magento\MediaStorage\Model\File\Storage\Response', 0]
+        ];
+    }
 }

app/code/Magento/PageCache/composer.json

@@ -6,6 +6,7 @@
         "magento/module-config": "1.0.0-beta3",
         "magento/module-store": "1.0.0-beta3",
         "magento/module-backend": "1.0.0-beta3",
+        "magento/module-media-storage": "1.0.0-beta3",
         "magento/framework": "1.0.0-beta3",
         "magento/magento-composer-installer": "*"
     },

lib/internal/Magento/Framework/App/PageCache/Identifier.php

@@ -40,8 +40,7 @@ public function __construct(
     public function getValue()
     {
         $data = [
-            $this->request->isSecure(),
-            $this->request->getRequestUri(),
+            $this->request->getUriString(),
             $this->request->get(\Magento\Framework\App\Response\Http::COOKIE_VARY_STRING)
                 ?: $this->context->getVaryString()
         ];

lib/internal/Magento/Framework/App/Test/Unit/PageCache/IdentifierTest.php

@@ -17,19 +17,15 @@ public function setUp()
         $this->objectManager = new ObjectManager($this);
     }
     /**
-     * @param bool $isSecure
      * @param string $uri
      * @param string|null $vary
      * @return \Magento\Framework\App\Request\Http
      */
-    protected function getRequestMock($isSecure, $uri, $vary = null)
+    protected function getRequestMock($uri, $vary = null)
     {
         $requestMock = $this->getMock('\Magento\Framework\App\Request\Http', [], [], '', false);
         $requestMock->expects($this->once())
-            ->method('isSecure')
-            ->willReturn($isSecure);
-        $requestMock->expects($this->once())
-            ->method('getRequestUri')
+            ->method('getUriString')
             ->willReturn($uri);
         $requestMock->expects($this->once())
             ->method('get')
@@ -51,16 +47,15 @@ protected function getContextMock($getVeryStringCalledTimes, $vary)
         return $contextMock;
     }
     /**
-     * @param bool $isSecure
      * @param string $uri
      * @param string|null $varyStringCookie
      * @param string|null $varyStringContext
      * @param string $expected
-     * @dataProvider dataProvider
+     * @dataProvider getValueDataProvider
      */
-    public function testGetValue($isSecure, $uri, $varyStringCookie, $varyStringContext, $expected)
+    public function testGetValue($uri, $varyStringCookie, $varyStringContext, $expected)
     {
-        $request = $this->getRequestMock($isSecure, $uri, $varyStringCookie);
+        $request = $this->getRequestMock($uri, $varyStringCookie);
         $context = $this->getContextMock($varyStringCookie ? 0 : 1, $varyStringContext);
         $model = $this->objectManager->getObject(
             '\Magento\Framework\App\PageCache\Identifier',
@@ -74,17 +69,16 @@ public function testGetValue($isSecure, $uri, $varyStringCookie, $varyStringCont
     /**
      * @return array
      */
-    public function dataProvider()
+    public function getValueDataProvider()
     {
-        $uri = 'index.php/customer';
-        $isSecure = 0;
+        $uri = 'http://domain.com/customer';
         $vary = 1;
-        $data = [$isSecure, $uri, $vary];
+        $data = [$uri, $vary];
         ksort($data);
         $expected = md5(serialize($data));
         return [
-            [$isSecure, $uri, $vary, null, $expected],
-            [$isSecure, $uri, null, $vary, $expected]
+            [$uri, $vary, null, $expected],
+            [$uri, null, $vary, $expected]
         ];
     }
 }