Skip to content

Commit b9d07f7

Browse files
VasylKozyrenkoVasylKozyrenko
committed
MTA-3236: Order Management: Extend existing functional automated tests
2 parents f3c190f + 91e9246 commit b9d07f7

File tree

2 files changed

+65
-11
lines changed

2 files changed

+65
-11
lines changed

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.php

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88

99
use Magento\Sales\Test\Fixture\OrderInjectable;
1010
use Magento\Mtf\TestCase\Injectable;
11+
use Magento\Mtf\TestStep\TestStepFactory;
1112

1213
/**
1314
* Preconditions:
14-
* 1. Enable payment method "Check/Money Order".
15+
* 1. Enable payment method: "Check/Money Order/Bank Transfer/Cash on Delivery/Purchase Order/Zero Subtotal Checkout".
1516
* 2. Enable shipping method one of "Flat Rate/Free Shipping".
1617
* 3. Create order.
1718
*
@@ -33,32 +34,42 @@ class CreateInvoiceEntityTest extends Injectable
3334
/* end tags */
3435

3536
/**
36-
* Set up configuration.
37+
* Factory for Test Steps.
3738
*
39+
* @var TestStepFactory
40+
*/
41+
protected $stepFactory;
42+
43+
/**
44+
* Prepare data.
45+
*
46+
* @param TestStepFactory $stepFactory
3847
* @return void
3948
*/
40-
public function __prepare()
49+
public function __prepare(TestStepFactory $stepFactory)
4150
{
42-
$this->objectManager->create(
43-
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
44-
['configData' => 'checkmo, flatrate']
45-
)->run();
51+
$this->stepFactory = $stepFactory;
4652
}
4753

4854
/**
4955
* Create invoice.
5056
*
5157
* @param OrderInjectable $order
5258
* @param array $data
59+
* @param string $configData
5360
* @return array
5461
*/
55-
public function test(OrderInjectable $order, array $data)
62+
public function test(OrderInjectable $order, array $data, $configData)
5663
{
5764
// Preconditions
65+
$this->stepFactory->create(
66+
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
67+
['configData' => $configData]
68+
)->run();
5869
$order->persist();
5970

6071
// Steps
61-
$result = $this->objectManager->create(
72+
$result = $this->stepFactory->create(
6273
\Magento\Sales\Test\TestStep\CreateInvoiceStep::class,
6374
['order' => $order, 'data' => $data]
6475
)->run();
@@ -73,6 +84,6 @@ public function test(OrderInjectable $order, array $data)
7384
*/
7485
public function tearDown()
7586
{
76-
$this->objectManager->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
87+
$this->stepFactory->create(\Magento\Customer\Test\TestStep\LogoutCustomerOnFrontendStep::class)->run();
7788
}
7889
}

‎dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/CreateInvoiceEntityTest.xml

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<variation name="CreateInvoiceEntityTestVariation1">
1111
<data name="order/dataset" xsi:type="string">default</data>
1212
<data name="order/data/price/dataset" xsi:type="string">full_invoice</data>
13-
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::default</data>
1413
<data name="order/data/total_qty_ordered/0" xsi:type="string">1</data>
1514
<data name="data/items_data/0/qty" xsi:type="string">-</data>
1615
<data name="data/form_data/do_shipment" xsi:type="string">Yes</data>
1716
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
17+
<data name="configData" xsi:type="string">checkmo</data>
1818
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceWithShipmentSuccessMessage" />
1919
<constraint name="Magento\Sales\Test\Constraint\AssertNoInvoiceButton" />
2020
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceInInvoicesTab" />
@@ -29,14 +29,57 @@
2929
<data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
3030
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
3131
<data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
32+
<data name="order/data/payment_auth_expiration/method" xsi:type="string">banktransfer</data>
3233
<data name="data/items_data/0/qty" xsi:type="string">1</data>
3334
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
3435
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
36+
<data name="configData" xsi:type="string">banktransfer</data>
3537
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
3638
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceInInvoicesTab" />
3739
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceInInvoicesGrid" />
3840
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceItems" />
3941
<constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
4042
</variation>
43+
<variation name="CreateInvoiceEntityTestVariationWithCashOnDeliveryPaymentMethod">
44+
<data name="order/dataset" xsi:type="string">default</data>
45+
<data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
46+
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
47+
<data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
48+
<data name="order/data/payment_auth_expiration/method" xsi:type="string">cashondelivery</data>
49+
<data name="data/items_data/0/qty" xsi:type="string">1</data>
50+
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
51+
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
52+
<data name="configData" xsi:type="string">cashondelivery</data>
53+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
54+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
55+
</variation>
56+
<variation name="CreateInvoiceEntityTestVariationWithPurchaseOrderPaymentMethod">
57+
<data name="order/dataset" xsi:type="string">default</data>
58+
<data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
59+
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_100_dollar</data>
60+
<data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
61+
<data name="order/data/payment_auth_expiration/method" xsi:type="string">purchaseorder</data>
62+
<data name="data/items_data/0/qty" xsi:type="string">1</data>
63+
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
64+
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
65+
<data name="configData" xsi:type="string">purchaseorder</data>
66+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
67+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
68+
</variation>
69+
<variation name="CreateInvoiceEntityTestVariationWithZeroSubtotalCheckout">
70+
<data name="order/dataset" xsi:type="string">default</data>
71+
<data name="order/data/price/dataset" xsi:type="string">partial_invoice</data>
72+
<data name="order/data/entity_id/products" xsi:type="string">catalogProductSimple::product_10_dollar</data>
73+
<data name="order/data/total_qty_ordered/0" xsi:type="string">-</data>
74+
<data name="order/data/payment_auth_expiration/method" xsi:type="string">free</data>
75+
<data name="order/data/shipping_method" xsi:type="string">freeshipping_freeshipping</data>
76+
<data name="order/data/coupon_code/dataset" xsi:type="string">active_sales_rule_with_fixed_price_discount_coupon</data>
77+
<data name="data/items_data/0/qty" xsi:type="string">1</data>
78+
<data name="data/form_data/do_shipment" xsi:type="string">No</data>
79+
<data name="data/form_data/comment_text" xsi:type="string">comments</data>
80+
<data name="configData" xsi:type="string">zero_subtotal_checkout</data>
81+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoiceSuccessCreateMessage" />
82+
<constraint name="Magento\Sales\Test\Constraint\AssertInvoicedAmountOnFrontend" />
83+
</variation>
4184
</testCase>
4285
</config>

0 commit comments

Comments
 (0)