Set the customer address and is gust flag before setting the addresse…

…s against the order
magento · Sep 20, 2018 · 214ba67 · 214ba67
1 parent ad35b6f
commit 214ba67
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -6,6 +6,7 @@
 
 use Magento\Sales\Model\Order;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order\Address as OrderAddress;
 
 require 'order.php';
 /** @var Order $order */
@@ -59,20 +60,19 @@
 
     // Reset addresses
     /** @var Order\Address $billingAddress */
-    $billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+    $billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
     $billingAddress->setAddressType('billing');
 
-    /** @var Order\Address $shippingAddress */
-    $shippingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
-    $shippingAddress->setAddressType('shipping');
+    $shippingAddress = clone $billingAddress;
+    $shippingAddress->setId(null)->setAddressType('shipping');
 
     $order
         ->setData($orderData)
         ->addItem($orderItem)
-        ->setBillingAddress($billingAddress)
-        ->setShippingAddress($shippingAddress)
         ->setCustomerIsGuest(true)
-        ->setCustomerEmail('[email protected]');
+        ->setCustomerEmail('[email protected]')
+        ->setBillingAddress($billingAddress)
+        ->setShippingAddress($shippingAddress);
 
     $orderRepository->save($order);
 }