Merge remote-tracking branch '39601/bug/issue-39568-reorder-bug' into marcomprs

Author: engcom-Charlie

app/code/Magento/Sales/Helper/Reorder.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Sales\Helper;
@@ -11,12 +11,7 @@
  */
 class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
-
-    /**
-     * @var \Magento\Customer\Model\Session
-     */
-    protected $customerSession;
+    public const XML_PATH_SALES_REORDER_ALLOW = 'sales/reorder/allow';
 
     /**
      * @var \Magento\Sales\Api\OrderRepositoryInterface
@@ -25,22 +20,21 @@ class Reorder extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Customer\Model\Session $customerSession,
         \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
     ) {
         $this->orderRepository = $orderRepository;
-        $this->customerSession = $customerSession;
         parent::__construct(
             $context
         );
     }
 
     /**
+     * Check if reorder is allowed
+     *
      * @return bool
      */
     public function isAllow()
@@ -78,10 +72,6 @@ public function canReorder($orderId)
         if (!$this->isAllowed($order->getStore())) {
             return false;
         }
-        if ($this->customerSession->isLoggedIn()) {
-            return $order->canReorder();
-        } else {
-            return true;
-        }
+        return $order->canReorder();
     }
 }

app/code/Magento/Sales/Test/Unit/Helper/ReorderTest.php

@@ -1,13 +1,12 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\Sales\Test\Unit\Helper;
 
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
@@ -40,11 +39,6 @@ class ReorderTest extends TestCase
      */
     protected $orderMock;
 
-    /**
-     * @var MockObject|Session
-     */
-    protected $customerSessionMock;
-
     /**
      * @var OrderRepositoryInterface|MockObject
      */
@@ -66,15 +60,10 @@ protected function setUp(): void
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
 
-        $this->customerSessionMock = $this->getMockBuilder(Session::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->repositoryMock = $this->getMockBuilder(OrderRepositoryInterface::class)
             ->getMockForAbstractClass();
         $this->helper = new Reorder(
             $contextMock,
-            $this->customerSessionMock,
             $this->repositoryMock
         );
 
@@ -156,40 +145,17 @@ public function testCanReorderStoreNotAllowed()
         $this->assertFalse($this->helper->canReorder(1));
     }
 
-    /**
-     * Tests what happens if the customer is not logged in and the store does allow re-orders.
-     *
-     * @return void
-     */
-    public function testCanReorderCustomerNotLoggedIn()
-    {
-        $this->setupOrderMock(true);
-
-        $this->customerSessionMock->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(false);
-        $this->repositoryMock->expects($this->once())
-            ->method('get')
-            ->with(1)
-            ->willReturn($this->orderMock);
-        $this->assertTrue($this->helper->canReorder(1));
-    }
-
     /**
      * Tests what happens if the customer is logged in and the order does or does not allow reorders.
      *
      * @param bool $orderCanReorder
      * @return void
      * @dataProvider getOrderCanReorder
      */
-    public function testCanReorderCustomerLoggedInAndOrderCanReorder($orderCanReorder)
+    public function testCanReorder($orderCanReorder)
     {
         $this->setupOrderMock(true);
 
-        $this->customerSessionMock->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(true);
-
         $this->orderMock->expects($this->once())
             ->method('canReorder')
             ->willReturn($orderCanReorder);