MAGETWO-31933: Can't change shipping address when creating order in backend

 - provide simpler fix
 - re-flow original unit test

Author: Mike Weis

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

@@ -147,19 +147,9 @@ public function getQuote()
                     $this->_quote->setStoreId($this->getStoreId());
                 }
 
-                if ($this->getCustomerId()) {
-                    // on a new quote, this will return an empty array
-                    $addresses = $this->_quote->getAllAddresses();
-                    $billingAddress = $this->findAddressByType(
-                        $addresses,
-                        \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_BILLING
-                    );
-                    $shippingAddress = $this->findAddressByType(
-                        $addresses,
-                        \Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING
-                    );
+                if ($this->getCustomerId() && $this->getCustomerId() != $this->_quote->getCustomerId()) {
                     $customer = $this->customerRepository->getById($this->getCustomerId());
-                    $this->_quote->assignCustomerWithAddressChange($customer, $billingAddress, $shippingAddress);
+                    $this->_quote->assignCustomer($customer);
                 }
             }
             $this->_quote->setIgnoreOldQty(true);
@@ -169,25 +159,6 @@ public function getQuote()
         return $this->_quote;
     }
 
-    /**
-     * Returns the type of address requested, or null if no type of address is found
-     *
-     * @param \Magento\Quote\Model\Quote\Address[] $addresses
-     * @param string $type   ex: 'billing' or 'shipping'
-     * @return \Magento\Quote\Model\Quote\Address|null
-     */
-    protected function findAddressByType($addresses, $type)
-    {
-        $theAddress = null;
-        foreach ($addresses as $address) {
-            if ($address->getAddressType() == $type) {
-                $theAddress = $address;
-                break;
-            }
-        }
-        return $theAddress;
-    }
-
     /**
      * Retrieve store model object
      *

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

@@ -7,9 +7,7 @@
 
 /**
  * Class QuoteTest
- * 
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class QuoteTest extends \PHPUnit_Framework_TestCase
 {
@@ -88,16 +86,6 @@ class QuoteTest extends \PHPUnit_Framework_TestCase
      */
     protected $groupManagementMock;
 
-    /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $billingAddressMock;
-
-    /**
-     * @var \Magento\Quote\Model\Quote\Address|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $shippingAddressMock;
-
     /**
      * Set up
      *
@@ -227,18 +215,44 @@ protected function setUp()
     /**
      * Run test getQuote method
      *
-     * @param \Magento\Quote\Model\Quote\Address[] $allAddresses
-     * @param \Magento\Quote\Model\Quote\Address|null $expectedBillingAddress
-     * @param \Magento\Quote\Model\Quote\Address|null $expectedShippingAddress
      * @return void
-     * @dataProvider allAddressesDataProvider
      */
-    public function testGetQuoteWithoutQuoteId($allAddresses, $expectedBillingAddress, $expectedShippingAddress)
+    public function testGetQuoteWithoutQuoteId()
     {
-        $storeId = 10;
         $quoteId = 22;
-        $customerGroupId = 77;
+        $storeId = 10;
         $customerId = 66;
+        $customerGroupId = 77;
+
+        $this->quote->expects($this->any())
+            ->method('getQuoteId')
+            ->will($this->returnValue(null));
+        $this->quote->expects($this->any())
+            ->method('setQuoteId')
+            ->with($quoteId);
+        $this->quote->expects($this->any())
+            ->method('getStoreId')
+            ->will($this->returnValue($storeId));
+        $this->quote->expects($this->any())
+            ->method('getCustomerId')
+            ->will($this->returnValue($customerId));
+
+        $defaultGroup = $this->getMockBuilder('Magento\Customer\Api\Data\GroupInterface')
+            ->getMock();
+        $defaultGroup->expects($this->any())
+            ->method('getId')
+            ->will($this->returnValue($customerGroupId));
+        $this->groupManagementMock->expects($this->any())
+            ->method('getDefaultGroup')
+            ->will($this->returnValue($defaultGroup));
+
+        $dataCustomerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willReturn($dataCustomerMock);
 
         $quoteMock = $this->getMock(
             'Magento\Quote\Model\Quote',
@@ -247,38 +261,18 @@ public function testGetQuoteWithoutQuoteId($allAddresses, $expectedBillingAddres
                 'setCustomerGroupId',
                 'setIsActive',
                 'getId',
-                'assignCustomerWithAddressChange',
+                'assignCustomer',
                 'setIgnoreOldQty',
                 'setIsSuperMode',
-                'getAllAddresses',
                 '__wakeup'
             ],
             [],
             '',
             false
         );
-
-        $defaultGroup = $this->getMockBuilder('Magento\Customer\Api\Data\GroupInterface')
-            ->getMock();
-        $defaultGroup->expects($this->any())
-            ->method('getId')
-            ->will($this->returnValue($customerGroupId));
-        $this->groupManagementMock->expects($this->any())
-            ->method('getDefaultGroup')
-            ->will($this->returnValue($defaultGroup));
-
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
-        $this->quote->expects($this->any())
-            ->method('getStoreId')
-            ->will($this->returnValue($storeId));
         $quoteMock->expects($this->once())
             ->method('setStoreId')
             ->with($storeId);
-        $this->quote->expects($this->any())
-            ->method('getQuoteId')
-            ->will($this->returnValue(null));
         $quoteMock->expects($this->once())
             ->method('setCustomerGroupId')
             ->with($customerGroupId)
@@ -287,90 +281,27 @@ public function testGetQuoteWithoutQuoteId($allAddresses, $expectedBillingAddres
             ->method('setIsActive')
             ->with(false)
             ->will($this->returnSelf());
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('save')
-            ->with($quoteMock);
         $quoteMock->expects($this->once())
             ->method('getId')
             ->will($this->returnValue($quoteId));
-        $this->quote->expects($this->any())
-            ->method('setQuoteId')
-            ->with($quoteId);
-        $this->quote->expects($this->any())
-            ->method('getCustomerId')
-            ->will($this->returnValue($customerId));
-        $dataCustomerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($dataCustomerMock);
         $quoteMock->expects($this->once())
-            ->method('assignCustomerWithAddressChange')
-            ->with($dataCustomerMock, $expectedBillingAddress, $expectedShippingAddress);
+            ->method('assignCustomer')
+            ->with($dataCustomerMock);
         $quoteMock->expects($this->once())
             ->method('setIgnoreOldQty')
             ->with(true);
         $quoteMock->expects($this->once())
             ->method('setIsSuperMode')
             ->with(true);
-        $quoteMock->expects($this->any())
-            ->method('getAllAddresses')
-            ->will($this->returnValue($allAddresses));
 
-        $this->assertEquals($quoteMock, $this->quote->getQuote());
-    }
-
-    /**
-     * @return array
-     */
-    public function allAddressesDataProvider()
-    {
-        // since setup() is called after the dataProvider, ensure we have valid addresses
-        $this->buildAddressMocks();
-
-        return [
-            'empty addresses' => [
-                [],
-                null,
-                null
-            ],
-            'use typical addresses' => [
-                [$this->billingAddressMock, $this->shippingAddressMock],
-                $this->billingAddressMock,
-                $this->shippingAddressMock
-            ],
-        ];
-    }
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($quoteMock));
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('save')
+            ->with($quoteMock);
 
-    protected function buildAddressMocks()
-    {
-        if ($this->billingAddressMock == null) {
-            $this->billingAddressMock = $this->getMock(
-                'Magento\Quote\Model\Quote\Address',
-                ['getAddressType'],
-                [],
-                '',
-                false
-            );
-            $this->billingAddressMock->expects($this->any())
-                ->method('getAddressType')
-                ->will($this->returnValue(\Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_BILLING));
-        }
-
-        if ($this->shippingAddressMock == null) {
-            $this->shippingAddressMock = $this->getMock(
-                'Magento\Quote\Model\Quote\Address',
-                ['getAddressType'],
-                [],
-                '',
-                false
-            );
-            $this->shippingAddressMock->expects($this->any())
-                ->method('getAddressType')
-                ->will($this->returnValue(\Magento\Quote\Model\Quote\Address::ADDRESS_TYPE_SHIPPING));
-        }
+        $this->assertEquals($quoteMock, $this->quote->getQuote());
     }
 
     /**
@@ -380,69 +311,67 @@ protected function buildAddressMocks()
      */
     public function testGetQuoteWithQuoteId()
     {
-        $storeId = 10;
         $quoteId = 22;
+        $storeId = 10;
         $customerId = 66;
 
+        $this->quote->expects($this->any())
+            ->method('getQuoteId')
+            ->will($this->returnValue($quoteId));
+        $this->quote->expects($this->any())
+            ->method('setQuoteId')
+            ->with($quoteId);
+        $this->quote->expects($this->any())
+            ->method('getStoreId')
+            ->will($this->returnValue($storeId));
+        $this->quote->expects($this->any())
+            ->method('getCustomerId')
+            ->will($this->returnValue($customerId));
+
+        $dataCustomerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->customerRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->with($customerId)
+            ->willReturn($dataCustomerMock);
+
         $quoteMock = $this->getMock(
             'Magento\Quote\Model\Quote',
             [
                 'setStoreId',
                 'setCustomerGroupId',
                 'setIsActive',
                 'getId',
-                'assignCustomerWithAddressChange',
+                'assignCustomer',
                 'setIgnoreOldQty',
                 'setIsSuperMode',
-                'getAllAddresses',
                 '__wakeup'
             ],
             [],
             '',
             false
         );
-
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('create')
-            ->will($this->returnValue($quoteMock));
-        $this->quote->expects($this->any())
-            ->method('getStoreId')
-            ->will($this->returnValue($storeId));
         $quoteMock->expects($this->once())
             ->method('setStoreId')
             ->with($storeId);
-        $this->quote->expects($this->any())
-            ->method('getQuoteId')
-            ->will($this->returnValue($quoteId));
-        $this->quoteRepositoryMock->expects($this->once())
-            ->method('get')
-            ->with($quoteId)
-            ->willReturn($quoteMock);
-        $this->quote->expects($this->any())
-            ->method('setQuoteId')
-            ->with($quoteId);
-        $this->quote->expects($this->any())
-            ->method('getCustomerId')
-            ->will($this->returnValue($customerId));
-        $dataCustomerMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->customerRepositoryMock->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($dataCustomerMock);
         $quoteMock->expects($this->once())
-            ->method('assignCustomerWithAddressChange')
+            ->method('assignCustomer')
             ->with($dataCustomerMock);
         $quoteMock->expects($this->once())
             ->method('setIgnoreOldQty')
             ->with(true);
         $quoteMock->expects($this->once())
             ->method('setIsSuperMode')
             ->with(true);
-        $quoteMock->expects($this->any())
-            ->method('getAllAddresses')
-            ->will($this->returnValue([]));
+
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('create')
+            ->will($this->returnValue($quoteMock));
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('get')
+            ->with($quoteId)
+            ->willReturn($quoteMock);
 
         $this->assertEquals($quoteMock, $this->quote->getQuote());
     }