Skip to content

Magento_Sales integration tests: Fix addresses in order_list fixture #16351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 26, 2018
Merged

Magento_Sales integration tests: Fix addresses in order_list fixture #16351

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e746480
Fix setting billing address twice. Instead, set shipping address also…
evktalo Jun 22, 2018
1481591
Reset addresses for each order. Otherwise they cannot be accessed.
evktalo Jun 23, 2018
cb578e7
Improve var tags.
evktalo Jun 23, 2018
ad35b6f
Update Magento_Sales integrations tests to fix error when running RMA…
dmanners Sep 20, 2018
214ba67
Set the customer address and is gust flag before setting the addresse…
dmanners Sep 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions dev/tests/integration/testsuite/Magento/Sales/_files/order_list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
*/

use Magento\Sales\Model\Order;
use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Model\Order\Address as OrderAddress;

require 'order.php';
/** @var Order $order */
/** @var Order\Payment $payment */
/** @var Order\Item $orderItem */
/** @var Order\Address $billingAddress */
/** @var Order\Address $shippingAddress */
/** @var Order\Payment $payment */
/** @var Order\Item $orderItem */
/** @var array $addressData Data for creating addresses for the orders. */
$orders = [
[
'increment_id' => '100000002',
Expand Down Expand Up @@ -48,16 +49,30 @@
],
];

/** @var OrderRepositoryInterface $orderRepository */
$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
/** @var array $orderData */
foreach ($orders as $orderData) {
/** @var $order \Magento\Sales\Model\Order */
$order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
\Magento\Sales\Model\Order::class
);

// Reset addresses
/** @var Order\Address $billingAddress */
$billingAddress = $objectManager->create(OrderAddress::class, ['data' => $addressData]);
$billingAddress->setAddressType('billing');

$shippingAddress = clone $billingAddress;
$shippingAddress->setId(null)->setAddressType('shipping');

$order
->setData($orderData)
->addItem($orderItem)
->setCustomerIsGuest(true)
->setCustomerEmail('[email protected]')
->setBillingAddress($billingAddress)
->setBillingAddress($shippingAddress)
->save();
->setShippingAddress($shippingAddress);

$orderRepository->save($order);
}