Merge remote-tracking branch 'l3/MC-39796' into PR-01-21

Author: dhorytskyi

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php

@@ -119,7 +119,6 @@ public function execute()
                 $this->_getOrderCreateModel()->initFromOrder($order);
                 $resultRedirect->setPath('sales/*');
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->logger->critical($e);
                 $this->messageManager->addErrorMessage($e->getMessage());
                 return $resultRedirect->setPath('sales/*');
             } catch (\Exception $e) {

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php

@@ -14,6 +14,7 @@
 use Magento\Backend\Model\View\Result\Redirect;
 use Magento\Backend\Model\View\Result\RedirectFactory;
 use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\ObjectManagerInterface;
@@ -26,6 +27,7 @@
 use Magento\Sales\Model\Order\Reorder\UnavailableProductsProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 /**
  * Verify reorder class.
@@ -115,6 +117,11 @@ class ReorderTest extends TestCase
      */
     private $orderId;
 
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
     /**
      * @inheritDoc
      */
@@ -141,6 +148,7 @@ protected function setUp(): void
             ->getMock();
         $this->messageManagerMock = $this->getMockBuilder(ManagerInterface::class)
             ->getMockForAbstractClass();
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $objectManager = new ObjectManager($this);
         $this->context = $objectManager->getObject(
@@ -161,6 +169,7 @@ protected function setUp(): void
                 'reorderHelper' => $this->reorderHelperMock,
                 'context' => $this->context,
                 'resultForwardFactory' => $this->resultForwardFactoryMock,
+                'logger' => $this->loggerMock
             ]
         );
     }
@@ -299,6 +308,43 @@ public function testExecuteRedirectNewOrderWithException(): void
         $this->assertInstanceOf(Redirect::class, $this->reorder->execute());
     }
 
+    /**
+     * Verify redirect new order with throws out of stock exception.
+     *
+     * @return void
+     */
+    public function testExecuteReorderWithThrowsLocalizedException(): void
+    {
+        $errorPhrase = __('This product is out of stock.');
+        $exception = new LocalizedException($errorPhrase);
+
+        $this->clearStorage();
+        $this->getOrder();
+        $this->canReorder(true);
+        $this->createRedirect();
+        $this->getOrderId($this->orderId);
+        $this->getUnavailableProducts([]);
+
+        $this->orderMock->expects($this->once())
+            ->method('setReordered')
+            ->with(true)
+            ->willThrowException($exception);
+        $this->loggerMock
+            ->expects($this->any())
+            ->method('critical')
+            ->willReturn($exception);
+        $this->messageManagerMock
+            ->expects($this->once())
+            ->method('addErrorMessage')
+            ->willReturnSelf();
+        $this->resultRedirectMock
+            ->expects($this->once())
+            ->method('setPath')
+            ->with('sales/*')
+            ->willReturnSelf();
+        $this->assertInstanceOf(Redirect::class, $this->reorder->execute());
+    }
+
     /**
      * Mock clear storage.
      *