MAGETWO-52385: Order data is not transferred to new order when making Reorder

Author: ishakhsuvarov

app/code/Magento/Backend/Model/Session/Quote.php

@@ -150,7 +150,7 @@ public function __construct(
      */
     public function getQuote()
     {
-        $cartManagement = $this->getCartManagementDependency();
+        $cartManagement = $this->getCartManagement();
 
         if ($this->_quote === null) {
             if ($this->getStoreId()) {
@@ -180,7 +180,7 @@ public function getQuote()
      * @return CartManagementInterface
      * @deprecated
      */
-    private function getCartManagementDependency()
+    private function getCartManagement()
     {
         if ($this->cartManagement === null) {
             $this->cartManagement = ObjectManager::getInstance()->get(CartManagementInterface::class);

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -92,6 +92,11 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
      */
     protected $quoteFactoryMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $cartManagementMock;
+
     /**
      * Set up
      *
@@ -197,9 +202,16 @@ protected function setUp()
         );
 
         $this->quoteFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteFactory', ['create'], [], '', false);
+        $this->cartManagementMock = $this->getMock(
+            \Magento\Quote\Api\CartManagementInterface::class,
+            [],
+            [],
+            '',
+            false
+        );
 
         $this->quote = $this->getMock(
-            'Magento\Backend\Model\Session\Quote',
+            \Magento\Backend\Model\Session\Quote::class,
             ['getStoreId', 'getQuoteId', 'setQuoteId', 'hasCustomerId', 'getCustomerId'],
             [
                 'request' => $this->requestMock,
@@ -217,10 +229,12 @@ protected function setUp()
                 'storeManager' => $this->storeManagerMock,
                 'groupManagement' => $this->groupManagementMock,
                 'quoteFactory' => $this->quoteFactoryMock
-            ],
-            '',
-            true
+            ]
         );
+
+        $this->prepareObjectManager([
+            [\Magento\Quote\Api\CartManagementInterface::class, $this->cartManagementMock]
+        ]);
     }
 
     /**
@@ -235,6 +249,8 @@ public function testGetQuoteWithoutQuoteId()
         $customerId = 66;
         $customerGroupId = 77;
 
+        $this->cartManagementMock->expects($this->once())->method('createEmptyCart')->willReturn($quoteId);
+
         $this->quote->expects($this->any())
             ->method('getQuoteId')
             ->will($this->returnValue(null));
@@ -271,7 +287,6 @@ public function testGetQuoteWithoutQuoteId()
                 'setStoreId',
                 'setCustomerGroupId',
                 'setIsActive',
-                'getId',
                 'assignCustomer',
                 'setIgnoreOldQty',
                 'setIsSuperMode',
@@ -281,9 +296,7 @@ public function testGetQuoteWithoutQuoteId()
             '',
             false
         );
-        $quoteMock->expects($this->once())
-            ->method('setStoreId')
-            ->with($storeId);
+        $this->quoteRepositoryMock->expects($this->once())->method('get')->willReturn($quoteMock);
         $quoteMock->expects($this->once())
             ->method('setCustomerGroupId')
             ->with($customerGroupId)
@@ -292,9 +305,6 @@ public function testGetQuoteWithoutQuoteId()
             ->method('setIsActive')
             ->with(false)
             ->will($this->returnSelf());
-        $quoteMock->expects($this->once())
-            ->method('getId')
-            ->will($this->returnValue($quoteId));
         $quoteMock->expects($this->once())
             ->method('assignCustomer')
             ->with($dataCustomerMock);
@@ -305,13 +315,6 @@ public function testGetQuoteWithoutQuoteId()
             ->method('setIsSuperMode')
             ->with(true);
 
-        $this->quoteFactoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('save')
-            ->with($quoteMock);
-
         $this->assertEquals($quoteMock, $this->quote->getQuote());
     }
 
@@ -380,9 +383,6 @@ public function testGetQuoteWithQuoteId($customerId, $quoteCustomerId, $expected
             ->method('getCustomerId')
             ->will($this->returnValue($quoteCustomerId));
 
-        $this->quoteFactoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
         $this->quoteRepositoryMock->expects($this->once())
             ->method('get')
             ->with($quoteId)
@@ -401,4 +401,19 @@ public function getQuoteDataProvider()
             'customer ids same' => [66, 66, 'never'],
         ];
     }
+
+    /**
+     * @param array $map
+     * @deprecated
+     */
+    private function prepareObjectManager($map)
+    {
+        $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $objectManagerMock->expects($this->any())->method('getInstance')->willReturnSelf();
+        $objectManagerMock->expects($this->any())->method('get')->will($this->returnValueMap($map));
+        $reflectionClass = new \ReflectionClass('Magento\Framework\App\ObjectManager');
+        $reflectionProperty = $reflectionClass->getProperty('_instance');
+        $reflectionProperty->setAccessible(true);
+        $reflectionProperty->setValue($objectManagerMock);
+    }
 }

app/code/Magento/Quote/Test/Unit/Model/QuoteRepository/SaveHandlerTest.php

@@ -120,7 +120,6 @@ public function testSaveForVirtualQuote()
             ->willReturn($this->itemMock);
         $this->quoteMock->expects($this->once())->method('setLastAddedItem')->with($this->itemMock);
         $this->quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($this->billingAddressMock);
-        $this->quoteMock->expects($this->exactly(2))->method('getIsActive')->willReturn(true);
         $this->billingAddressPersister
             ->expects($this->once())
             ->method('save')