From ad35b6f83dadcf3e33e7d6a09ca8125d189cfa87 Mon Sep 17 00:00:00 2001
From: David Manners <dmanners87@gmail.com>
Date: Thu, 20 Sep 2018 10:39:14 +0000
Subject: [PATCH] Update Magento_Sales integrations tests to fix error when
 running RMA module tests  - Use the order repository for saving,  - Use guest
 customer,  - Attach email address to order,

---
 .../testsuite/Magento/Sales/_files/order_list.php    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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
index 2789c8040f35..9a7442081770 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
@@ -5,6 +5,7 @@
  */
 
 use Magento\Sales\Model\Order;
+use Magento\Sales\Api\OrderRepositoryInterface;
 
 require 'order.php';
 /** @var Order $order */
@@ -47,6 +48,8 @@
     ],
 ];
 
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
 /** @var array $orderData */
 foreach ($orders as $orderData) {
     /** @var $order \Magento\Sales\Model\Order */
@@ -60,13 +63,16 @@
     $billingAddress->setAddressType('billing');
 
     /** @var Order\Address $shippingAddress */
-    $shippingAddress = clone $billingAddress;
-    $shippingAddress->setId(null)->setAddressType('shipping');
+    $shippingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+    $shippingAddress->setAddressType('shipping');
 
     $order
         ->setData($orderData)
         ->addItem($orderItem)
         ->setBillingAddress($billingAddress)
         ->setShippingAddress($shippingAddress)
-        ->save();
+        ->setCustomerIsGuest(true)
+        ->setCustomerEmail('customer@null.com');
+
+    $orderRepository->save($order);
 }