MC-37109: Session Cache Local Storage | Checkout Issue

Author: serhii-balko

app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php

@@ -1,16 +1,14 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Persistent\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
 
 /**
- *  Make persistent quote to be guest
+ * Make persistent quote to be guest
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
@@ -38,26 +36,26 @@ class MakePersistentQuoteGuestObserver implements ObserverInterface
     protected $_persistentData = null;
 
     /**
-     * @var \Magento\Persistent\Model\QuoteManager
+     * @var \Magento\Checkout\Model\Session
      */
-    protected $quoteManager;
+    private $checkoutSession;
 
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Persistent\Model\QuoteManager $quoteManager
+     * @param \Magento\Checkout\Model\Session $checkoutSession
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
         \Magento\Persistent\Helper\Data $persistentData,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Persistent\Model\QuoteManager $quoteManager
+        \Magento\Checkout\Model\Session $checkoutSession
     ) {
         $this->_persistentSession = $persistentSession;
         $this->_persistentData = $persistentData;
         $this->_customerSession = $customerSession;
-        $this->quoteManager = $quoteManager;
+        $this->checkoutSession = $checkoutSession;
     }
 
     /**
@@ -74,7 +72,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
                 || $this->_persistentData->isShoppingCartPersist()
             ) {
-                $this->quoteManager->setGuest(true);
+                $this->checkoutSession->clearQuote()->clearStorage();
             }
         }
     }

app/code/Magento/Persistent/Test/Unit/Observer/MakePersistentQuoteGuestObserverTest.php

@@ -1,19 +1,18 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Checkout\Model\Session as CheckoutSession;
 use Magento\Framework\Event;
 use Magento\Framework\Event\Observer;
 use Magento\Persistent\Controller\Index;
 use Magento\Persistent\Helper\Data;
 use Magento\Persistent\Helper\Session;
-use Magento\Persistent\Model\QuoteManager;
 use Magento\Persistent\Observer\MakePersistentQuoteGuestObserver;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -48,10 +47,10 @@ class MakePersistentQuoteGuestObserverTest extends TestCase
     /**
      * @var MockObject
      */
-    protected $quoteManagerMock;
+    protected $checkoutSession;
 
     /**
-     * @var MockObject
+     * @var CheckoutSession|MockObject
      */
     protected $eventManagerMock;
 
@@ -60,14 +59,17 @@ class MakePersistentQuoteGuestObserverTest extends TestCase
      */
     protected $actionMock;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $this->actionMock = $this->createMock(Index::class);
         $this->observerMock = $this->createMock(Observer::class);
         $this->sessionHelperMock = $this->createMock(Session::class);
         $this->helperMock = $this->createMock(Data::class);
         $this->customerSessionMock = $this->createMock(\Magento\Customer\Model\Session::class);
-        $this->quoteManagerMock = $this->createMock(QuoteManager::class);
+        $this->checkoutSession = $this->createMock(CheckoutSession::class);
         $this->eventManagerMock =
             $this->getMockBuilder(Event::class)
                 ->addMethods(['getControllerAction'])
@@ -81,7 +83,7 @@ protected function setUp(): void
             $this->sessionHelperMock,
             $this->helperMock,
             $this->customerSessionMock,
-            $this->quoteManagerMock
+            $this->checkoutSession
         );
     }
 
@@ -94,7 +96,8 @@ public function testExecute()
         $this->sessionHelperMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(false);
         $this->helperMock->expects($this->never())->method('isShoppingCartPersist');
-        $this->quoteManagerMock->expects($this->once())->method('setGuest')->with(true);
+        $this->checkoutSession->expects($this->once())->method('clearQuote')->willReturnSelf();
+        $this->checkoutSession->expects($this->once())->method('clearStorage')->willReturnSelf();
         $this->model->execute($this->observerMock);
     }
 
@@ -107,7 +110,8 @@ public function testExecuteWhenShoppingCartIsPersist()
         $this->sessionHelperMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(true);
         $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->willReturn(true);
-        $this->quoteManagerMock->expects($this->once())->method('setGuest')->with(true);
+        $this->checkoutSession->expects($this->once())->method('clearQuote')->willReturnSelf();
+        $this->checkoutSession->expects($this->once())->method('clearStorage')->willReturnSelf();
         $this->model->execute($this->observerMock);
     }
 
@@ -120,7 +124,8 @@ public function testExecuteWhenShoppingCartIsNotPersist()
         $this->sessionHelperMock->expects($this->once())->method('isPersistent')->willReturn(true);
         $this->customerSessionMock->expects($this->once())->method('isLoggedIn')->willReturn(true);
         $this->helperMock->expects($this->once())->method('isShoppingCartPersist')->willReturn(false);
-        $this->quoteManagerMock->expects($this->never())->method('setGuest');
+        $this->checkoutSession->expects($this->never())->method('clearQuote')->willReturnSelf();
+        $this->checkoutSession->expects($this->never())->method('clearStorage')->willReturnSelf();
         $this->model->execute($this->observerMock);
     }
 }