MAGETWO-38779: Stabilize story

Author: Dmytro Voskoboinikov

app/code/Magento/Checkout/Test/Unit/Block/Onepage/SuccessTest.php

@@ -21,11 +21,6 @@ class SuccessTest extends \PHPUnit_Framework_TestCase
      */
     protected $orderConfig;
 
-    /**
-     * @var \Magento\Sales\Model\OrderFactory | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $orderFactory;
-
     /**
      * @var \Magento\Checkout\Model\Session | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -36,14 +31,19 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->orderConfig = $this->getMock('Magento\Sales\Model\Order\Config', [], [], '', false);
-        $this->orderFactory = $this->getMock('Magento\Sales\Model\OrderFactory', ['create'], [], '', false);
-        $this->checkoutSession = $this->getMock('Magento\Checkout\Model\Session', ['getLastOrderId'], [], '', false);
+
+        $this->checkoutSession = $this->getMock(
+            'Magento\Checkout\Model\Session',
+            ['getLastOrderId', 'getLastRealOrderId', 'getLastOrderStatus'],
+            [],
+            '',
+            false
+        );
 
         $this->block = $objectManager->getObject(
             'Magento\Checkout\Block\Onepage\Success',
             [
                 'orderConfig' => $this->orderConfig,
-                'orderFactory' => $this->orderFactory,
                 'checkoutSession' => $this->checkoutSession
             ]
         );
@@ -74,28 +74,21 @@ public function testGetAdditionalInfoHtml()
     public function testToHtmlOrderVisibleOnFront(array $invisibleStatuses, $orderStatus, $expectedResult)
     {
         $orderId = 5;
-        $order = $this->getMock('Magento\Sales\Model\Order', ['getId', '__wakeup', 'load', 'getStatus'], [], '', false);
-
-        $order->expects($this->any())
-            ->method('load')
-            ->with($orderId)
-            ->will($this->returnValue($order));
-        $order->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue($orderId));
-        $order->expects($this->any())
-            ->method('getStatus')
-            ->will($this->returnValue($orderStatus));
+        $realOrderId = 100003332;
 
         $this->checkoutSession->expects($this->once())
             ->method('getLastOrderId')
             ->will($this->returnValue($orderId));
+        $this->checkoutSession->expects($this->once())
+            ->method('getLastRealOrderId')
+            ->will($this->returnValue($realOrderId));
+        $this->checkoutSession->expects($this->once())
+            ->method('getLastOrderStatus')
+            ->will($this->returnValue($orderStatus));
+
         $this->orderConfig->expects($this->any())
             ->method('getInvisibleOnFrontStatuses')
             ->will($this->returnValue($invisibleStatuses));
-        $this->orderFactory->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($order));
 
         $this->block->toHtml();
 

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -211,7 +211,7 @@ protected function setUp()
         $this->dataObjectHelperMock = $this->getMock('\Magento\Framework\Api\DataObjectHelper', [], [], '', false);
         $this->checkoutSessionMock = $this->getMock(
             'Magento\Checkout\Model\Session',
-            ['setLastQuoteId', 'setLastSuccessQuoteId', 'setLastOrderId', 'setLastRealOrderId'],
+            ['setLastQuoteId', 'setLastSuccessQuoteId', 'setLastOrderId', 'setLastRealOrderId', 'setLastOrderStatus'],
             [],
             '',
             false
@@ -652,6 +652,7 @@ public function testPlaceOrderIfCustomerIsGuest()
         $cartId = 100;
         $orderId = 332;
         $orderIncrementId = 100003332;
+        $orderStatus = 'status1';
         $email = 'email@mail.com';
 
         $this->quoteRepositoryMock->expects($this->once())
@@ -710,13 +711,17 @@ public function testPlaceOrderIfCustomerIsGuest()
         $service->expects($this->once())->method('submit')->willReturn($orderMock);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
+
         $orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
         $orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
+        $orderMock->expects($this->atLeastOnce())->method('getStatus')->willReturn($orderStatus);
 
         $this->checkoutSessionMock->expects($this->once())->method('setLastQuoteId')->with($cartId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastSuccessQuoteId')->with($cartId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastOrderId')->with($orderId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastRealOrderId')->with($orderIncrementId);
+        $this->checkoutSessionMock->expects($this->once())->method('setLastOrderStatus')->with($orderStatus);
+
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->willReturn(true);
 
         $this->assertEquals($orderId, $service->placeOrder($cartId));
@@ -763,6 +768,7 @@ public function testPlaceOrder()
         $cartId = 323;
         $orderId = 332;
         $orderIncrementId = 100003332;
+        $orderStatus = 'status1';
 
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Quote\Model\QuoteManagement $service */
         $service = $this->getMock(
@@ -822,13 +828,17 @@ public function testPlaceOrder()
         $service->expects($this->once())->method('submit')->willReturn($orderMock);
 
         $this->quoteMock->expects($this->atLeastOnce())->method('getId')->willReturn($cartId);
+
         $orderMock->expects($this->atLeastOnce())->method('getId')->willReturn($orderId);
         $orderMock->expects($this->atLeastOnce())->method('getIncrementId')->willReturn($orderIncrementId);
+        $orderMock->expects($this->atLeastOnce())->method('getStatus')->willReturn($orderStatus);
 
         $this->checkoutSessionMock->expects($this->once())->method('setLastQuoteId')->with($cartId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastSuccessQuoteId')->with($cartId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastOrderId')->with($orderId);
         $this->checkoutSessionMock->expects($this->once())->method('setLastRealOrderId')->with($orderIncrementId);
+        $this->checkoutSessionMock->expects($this->once())->method('setLastOrderStatus')->with($orderStatus);
+
         $this->agreementsValidatorMock->expects($this->once())->method('isValid')->willReturn(true);
 
         $paymentMethod = $this->getMock('Magento\Quote\Model\Quote\Payment', ['setChecks', 'getData'], [], '', false);