Skip to content

Commit fba8df9

Browse files
mykhailomatiolamykhailomatiola
committed
MC-37083: Create automated test for "[Timezone] Sales Exported Dates"
1 parent 2f11cf4 commit fba8df9

File tree

6 files changed

+37
-45
lines changed

6 files changed

+37
-45
lines changed

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/ExportTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ public function testExportCreditmemo(
5353
$url,
5454
['namespace' => $namespace, 'filters' => ['order_increment_id' => '200000001']]
5555
);
56-
$creditmemos = [];
57-
if ($format === ExportBase::CSV_FORMAT) {
58-
$creditmemos = $this->parseCsvResponse($response);
59-
} elseif ($format === ExportBase::XML_FORMAT) {
60-
$creditmemos = $this->parseXmlResponse($response);
61-
}
56+
$creditmemos = $this->parseResponse($format, $response);
6257
$creditmemo = $this->getCreditmemo('200000001');
6358
$exportedCreditmemo = reset($creditmemos);
6459
$this->assertNotFalse($exportedCreditmemo);

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ExportBase.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,25 @@ protected function dispatchExport(string $url, array $params): string
5454
return ob_get_clean();
5555
}
5656

57+
/**
58+
* Parses string response depends of format.
59+
*
60+
* @param string $format
61+
* @param string $response
62+
* @return array
63+
*/
64+
protected function parseResponse(string $format, string $response): array
65+
{
66+
$result = [];
67+
if ($format === ExportBase::CSV_FORMAT) {
68+
$result = $this->parseCsvResponse($response);
69+
} elseif ($format === ExportBase::XML_FORMAT) {
70+
$result = $this->parseXmlResponse($response);
71+
}
72+
73+
return $result;
74+
}
75+
5776
/**
5877
* Converts string in scv format to assoc array.
5978
*

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/ExportTest.php

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,17 @@ class ExportTest extends ExportBase
2020
* @magentoDataFixture Magento/Sales/_files/order_with_invoice_shipment_creditmemo_on_second_website.php
2121
* @dataProvider exportOrderDataProvider
2222
* @param string $format
23-
* @param string $namespace
2423
* @return void
2524
*/
26-
public function testExportOrder(string $format, string $namespace): void
25+
public function testExportOrder(string $format): void
2726
{
2827
$order = $this->getOrder('200000001');
2928
$url = $this->getExportUrl($format, null);
3029
$response = $this->dispatchExport(
3130
$url,
32-
['namespace' => $namespace, 'filters' => ['increment_id' => '200000001']]
31+
['namespace' => 'sales_order_grid', 'filters' => ['increment_id' => '200000001']]
3332
);
34-
$orders = [];
35-
if ($format === ExportBase::CSV_FORMAT) {
36-
$orders = $this->parseCsvResponse($response);
37-
} elseif ($format === ExportBase::XML_FORMAT) {
38-
$orders = $this->parseXmlResponse($response);
39-
}
33+
$orders = $this->parseResponse($format, $response);
4034
$exportedOrder = reset($orders);
4135
$this->assertNotFalse($exportedOrder);
4236
$this->assertEquals(
@@ -51,14 +45,8 @@ public function testExportOrder(string $format, string $namespace): void
5145
public function exportOrderDataProvider(): array
5246
{
5347
return [
54-
'order_grid_in_csv' => [
55-
'format' => ExportBase::CSV_FORMAT,
56-
'namespace' => 'sales_order_grid',
57-
],
58-
'order_grid_in_xml' => [
59-
'format' => ExportBase::XML_FORMAT,
60-
'namespace' => 'sales_order_grid',
61-
],
48+
'order_grid_in_csv' => ['format' => ExportBase::CSV_FORMAT],
49+
'order_grid_in_xml' => ['format' => ExportBase::XML_FORMAT],
6250
];
6351
}
6452
}

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/ExportTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ public function testExportInvoice(
5353
$url,
5454
['namespace' => $namespace, 'filters' => ['order_increment_id' => '200000001']]
5555
);
56-
$invoices = [];
57-
if ($format === ExportBase::CSV_FORMAT) {
58-
$invoices = $this->parseCsvResponse($response);
59-
} elseif ($format === ExportBase::XML_FORMAT) {
60-
$invoices = $this->parseXmlResponse($response);
61-
}
56+
$invoices = $this->parseResponse($format, $response);
6257
$invoice = $this->getInvoice('200000001');
6358
$exportedInvoice = reset($invoices);
6459
$this->assertNotFalse($exportedInvoice);

‎dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Shipment/ExportTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,7 @@ public function testExportShipment(
5353
$url,
5454
['namespace' => $namespace, 'filters' => ['order_increment_id' => '200000001']]
5555
);
56-
$shipments = [];
57-
if ($format === ExportBase::CSV_FORMAT) {
58-
$shipments = $this->parseCsvResponse($response);
59-
} elseif ($format === ExportBase::XML_FORMAT) {
60-
$shipments = $this->parseXmlResponse($response);
61-
}
56+
$shipments = $this->parseResponse($format, $response);
6257
$shipment = $this->getShipment('200000001');
6358
$exportedShipment = reset($shipments);
6459
$this->assertNotFalse($exportedShipment);

‎dev/tests/integration/testsuite/Magento/Sales/_files/order_with_invoice_shipment_creditmemo_on_second_website.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@
1010
use Magento\Sales\Api\CreditmemoItemRepositoryInterface;
1111
use Magento\Sales\Api\CreditmemoRepositoryInterface;
1212
use Magento\Sales\Api\Data\CreditmemoItemInterfaceFactory;
13+
use Magento\Sales\Api\Data\OrderInterface;
1314
use Magento\Sales\Api\Data\OrderInterfaceFactory;
15+
use Magento\Sales\Api\Data\OrderItemInterface;
16+
use Magento\Sales\Api\Data\OrderPaymentInterface;
1417
use Magento\Sales\Api\InvoiceManagementInterface;
1518
use Magento\Sales\Api\Data\OrderItemInterfaceFactory;
1619
use Magento\Sales\Api\OrderRepositoryInterface;
1720
use Magento\Sales\Model\Order;
1821
use Magento\Sales\Model\Order\Address as OrderAddress;
19-
use Magento\Sales\Model\Order\Creditmemo\Item;
22+
use Magento\Sales\Model\Order\Creditmemo;
2023
use Magento\Sales\Model\Order\CreditmemoFactory;
21-
use Magento\Sales\Model\Order\Item as OrderItem;
22-
use Magento\Sales\Model\Order\Payment;
2324
use Magento\Sales\Model\Order\ShipmentFactory;
2425
use Magento\Store\Model\StoreManagerInterface;
2526
use Magento\TestFramework\Helper\Bootstrap;
@@ -54,12 +55,12 @@
5455
$billingAddress->setAddressType(OrderAddress::TYPE_BILLING);
5556
$shippingAddress = clone $billingAddress;
5657
$shippingAddress->setId(null)->setAddressType(OrderAddress::TYPE_SHIPPING);
57-
/** @var Payment $payment */
58-
$payment = $objectManager->create(Payment::class);
58+
/** @var OrderPaymentInterface $payment */
59+
$payment = $objectManager->create(OrderPaymentInterface::class);
5960
$payment->setMethod('checkmo')
6061
->setAdditionalInformation('last_trans_id', '11122')
6162
->setAdditionalInformation('metadata', ['type' => 'free', 'fraudulent' => false]);
62-
/** @var OrderItem $orderItem */
63+
/** @var OrderItemInterface $orderItem */
6364
$orderItem = $objectManager->get(OrderItemInterfaceFactory::class)->create();
6465
$orderItem->setProductId($product->getId())
6566
->setQtyOrdered(2)
@@ -70,7 +71,7 @@
7071
->setName($product->getName())
7172
->setSku($product->getSku())
7273
->setName('Test item');
73-
/** @var Order $order */
74+
/** @var OrderInterface $order */
7475
$order = $objectManager->get(OrderInterfaceFactory::class)->create();
7576
$order->setIncrementId('200000001')
7677
->setState(Order::STATE_PROCESSING)
@@ -112,15 +113,14 @@
112113
$creditmemoFactory = $objectManager->get(CreditmemoFactory::class);
113114
$creditmemo = $creditmemoFactory->createByOrder($order, $order->getData());
114115
$creditmemo->setOrder($order);
115-
$creditmemo->setState(Magento\Sales\Model\Order\Creditmemo::STATE_OPEN);
116+
$creditmemo->setState(Creditmemo::STATE_OPEN);
116117
$creditmemo->setIncrementId($order->getIncrementId());
117118
$creditmemoRepository->save($creditmemo);
118119
$orderItem->setName('Test item')
119120
->setQtyRefunded(2)
120121
->setQtyInvoiced(2)
121122
->setOriginalPrice($product->getPrice());
122-
/** @var Item $creditItem */
123-
$creditItem = $objectManager->get(Item::class);
123+
$creditItem = $creditmemoItemFactory->create();
124124
$creditItem->setCreditmemo($creditmemo)
125125
->setName('Creditmemo item')
126126
->setOrderItemId($orderItem->getId())

0 commit comments

Comments
 (0)