MC-18094: Full page cache issue with non-default store view

Author: Roman Lytvynenko

app/code/Magento/Store/App/Action/Plugin/Context.php

@@ -133,7 +133,7 @@ private function processInvalidStoreRequested(
     private function updateContext(StoreInterface $store)
     {
         if (!$store->getConfig(Store::XML_PATH_STORE_IN_URL) ||
-            $store->getId() == $this->storeManager->getDefaultStoreView()->getId()
+            $store->getCode() == $this->storeManager->getDefaultStoreView()->getCode()
         ) {
             $this->httpContext->setValue(
                 StoreManagerInterface::CONTEXT_STORE,

app/code/Magento/Store/Test/Unit/App/Action/Plugin/ContextNonDefaultStoreDirectLinkTest.php

@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Test\Unit\App\Action\Plugin;
+
+use Magento\Framework\App\Action\AbstractAction;
+use Magento\Framework\App\Http\Context;
+use Magento\Framework\App\Http\Context as HttpContext;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Session\Generic;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Store\Api\StoreCookieManagerInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Website;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class ContextNonDefaultStoreDirectLinkTest
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ContextNonDefaultStoreDirectLinkTest extends TestCase
+{
+    const CURRENCY_SESSION = 'CNY';
+    const CURRENCY_DEFAULT = 'USD';
+    const CURRENCY_CURRENT_STORE = 'UAH';
+
+    /**
+     * @dataProvider cacheHitOnDirectLinkToNonDefaultStoreView
+     * @param $customStore
+     * @param $defaultStore
+     * @param $setValueNumberOfTimes
+     * @param $xmlPathStoreInUrl
+     * @return void
+     */
+    public function testCacheHitOnDirectLinkToNonDefaultStoreView(
+        $customStore,
+        $defaultStore,
+        $setValueNumberOfTimes,
+        $xmlPathStoreInUrl
+    ) {
+        $sessionMock = $this->createPartialMock(Generic::class, ['getCurrencyCode']);
+        $httpContextMock = $this->createMock(HttpContext::class);
+        $storeManager = $this->createMock(StoreManagerInterface::class);
+        $storeCookieManager = $this->createMock(StoreCookieManagerInterface::class);
+        $storeMock = $this->createMock(Store::class);
+        $currentStoreMock = $this->createMock(Store::class);
+        $requestMock = $this->getMockBuilder(RequestInterface::class)->getMockForAbstractClass();
+        $subjectMock = $this->getMockBuilder(AbstractAction::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $httpContextMock->expects($this->once())
+            ->method('getValue')
+            ->with(StoreManagerInterface::CONTEXT_STORE)
+            ->willReturn(null);
+        $websiteMock = $this->createPartialMock(
+            Website::class,
+            ['getDefaultStore', '__wakeup']
+        );
+
+        $plugin = (new ObjectManager($this))->getObject(
+            \Magento\Store\App\Action\Plugin\Context::class,
+            [
+                'session' => $sessionMock,
+                'httpContext' => $httpContextMock,
+                'storeManager' => $storeManager,
+                'storeCookieManager' => $storeCookieManager,
+            ]
+        );
+
+        $storeManager->method('getDefaultStoreView')
+            ->willReturn($storeMock);
+
+        $storeCookieManager->expects($this->once())
+            ->method('getStoreCodeFromCookie')
+            ->willReturn('storeCookie');
+
+        $currentStoreMock->expects($this->any())
+            ->method('getDefaultCurrencyCode')
+            ->willReturn(self::CURRENCY_CURRENT_STORE);
+
+        $currentStoreMock->expects($this->any())
+            ->method('getConfig')
+            ->willReturn($xmlPathStoreInUrl);
+
+        $currentStoreMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn($customStore);
+
+        $storeManager->expects($this->any())
+            ->method('getWebsite')
+            ->willReturn($websiteMock);
+
+        $websiteMock->expects($this->any())
+            ->method('getDefaultStore')
+            ->willReturn($storeMock);
+
+        $storeMock->expects($this->any())
+            ->method('getDefaultCurrencyCode')
+            ->willReturn(self::CURRENCY_DEFAULT);
+
+        $storeMock->expects($this->any())
+            ->method('getCode')
+            ->willReturn($defaultStore);
+
+        $requestMock->expects($this->any())
+            ->method('getParam')
+            ->with($this->equalTo('___store'))
+            ->willReturn($defaultStore);
+
+        $storeManager->method('getStore')
+            ->with($defaultStore)
+            ->willReturn($currentStoreMock);
+
+        $sessionMock->expects($this->any())
+            ->method('getCurrencyCode')
+            ->willReturn(self::CURRENCY_SESSION);
+
+        $httpContextMock->expects($this->exactly($setValueNumberOfTimes))
+            ->method('setValue');
+
+        $plugin->beforeDispatch(
+            $subjectMock,
+            $requestMock
+        );
+    }
+
+    public function cacheHitOnDirectLinkToNonDefaultStoreView()
+    {
+        return [
+            [
+                'custom_store',
+                'default',
+                1,
+                1
+            ],
+            [
+                'default',
+                'default',
+                2,
+                0
+            ],
+            [
+                'default',
+                'default',
+                2,
+                1
+            ],
+        ];
+    }
+}