Skip to content

Commit 0d22124

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-8824: [MFTF] Refactoring AdminCreateCreditMemoForOrderWithCashOnDeliveryTest #31395
- Merge Pull Request #31395 from AnnaAPak/magento2:ref-AdminCreateCreditMemoWithCashOnDeliveryTest - Merged commits: 1. bc147e2 2. 0344b4a 3. 012fb44 4. 725ac04 5. a6f783e 6. a66c188 7. 1efbd9f 8. 201960d
2 parents d3f202a + 201960d commit 0d22124

File tree

6 files changed

+132
-3
lines changed

6 files changed

+132
-3
lines changed

‎app/code/Magento/Payment/Test/Mftf/Data/PaymentMethodData.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@
1515
<entity name="CashOnDeliveryPaymentMethodDefault" type="cashondelivery_payment_method">
1616
<requiredEntity type="active">CashOnDeliveryEnableConfigData</requiredEntity>
1717
</entity>
18+
19+
<entity name="CashOnDeliveryPaymentMethod" type="payment_method">
20+
<data key="method">cashondelivery</data>
21+
</entity>
1822
</entities>

‎app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@
2424
<requiredEntity type="payment_method">PaymentMethodCheckMoneyOrder</requiredEntity>
2525
<requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
2626
</entity>
27+
28+
<entity name="CashOnDeliveryOrderPaymentMethod" type="CustomerPaymentInformation">
29+
<var key="cart_id" entityKey="return" entityType="CustomerCart"/>
30+
<requiredEntity type="payment_method">CashOnDeliveryPaymentMethod</requiredEntity>
31+
<requiredEntity type="billing_address">BillingAddressTX</requiredEntity>
32+
</entity>
2733
</entities>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickRefundOfflineOnCreditMemoDetailPageActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminClickRefundOfflineOnCreditMemoDetailPageActionGroup">
12+
13+
<click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickRefundOffline"/>
14+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccesMessage"/>
15+
<see selector="{{AdminMessagesSection.success}}" userInput="You created the credit memo." stepKey="seeSuccessMessage"/>
16+
</actionGroup>
17+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCheckNewCreditMemoTotalsForFranceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminCheckNewCreditMemoTotalsForFranceTest" extends="AdminCreateCreditMemoWithCashOnDeliveryTest">
11+
<test name="AdminCheckNewCreditMemoTotalsForFranceTest" extends="AdminCreateCreditMemoForOrderWithCashOnDeliveryTest">
1212
<annotations>
1313
<stories value="Credit memo entity for France locale"/>
1414
<title value="Credit memo entity for France locale"/>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoForOrderWithCashOnDeliveryTest.xml

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminCreateCreditMemoForOrderWithCashOnDeliveryTest">
12+
<annotations>
13+
<stories value="Credit memo entity"/>
14+
<title value="Create Credit Memo with cash on delivery payment method"/>
15+
<description value="Create Credit Memo with cash on delivery payment and assert 0 shipping refund"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-15863"/>
18+
<group value="sales"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
23+
24+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
25+
<createData entity="_defaultCategory" stepKey="createCategory"/>
26+
<createData entity="defaultSimpleProduct" stepKey="createProduct">
27+
<requiredEntity createDataKey="createCategory"/>
28+
</createData>
29+
30+
<magentoCLI command="config:set {{enabledCashOnDeliveryPayment.label}} {{enabledCashOnDeliveryPayment.value}}" stepKey="enableBankTransfer"/>
31+
32+
<createData entity="CustomerCart" stepKey="createCustomerCart">
33+
<requiredEntity createDataKey="createCustomer"/>
34+
</createData>
35+
36+
<createData entity="CustomerCartItem" stepKey="addCartItem">
37+
<requiredEntity createDataKey="createCustomerCart"/>
38+
<requiredEntity createDataKey="createProduct"/>
39+
</createData>
40+
41+
<createData entity="CustomerAddressInformation" stepKey="addCustomerOrderAddress">
42+
<requiredEntity createDataKey="createCustomerCart"/>
43+
</createData>
44+
45+
<updateData createDataKey="createCustomerCart" entity="CashOnDeliveryOrderPaymentMethod" stepKey="sendCustomerPaymentInformation">
46+
<requiredEntity createDataKey="createCustomerCart"/>
47+
</updateData>
48+
49+
<createData entity="Invoice" stepKey="invoiceOrderOne">
50+
<requiredEntity createDataKey="createCustomerCart"/>
51+
</createData>
52+
53+
</before>
54+
<after>
55+
<magentoCLI command="config:set {{disabledCashOnDeliveryPayment.label}} {{disabledCashOnDeliveryPayment.value}}" stepKey="disableBankTransfer"/>
56+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
57+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
58+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
59+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
60+
</after>
61+
62+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="onOrderPage"/>
63+
<actionGroup ref="AdminOrdersGridClearFiltersActionGroup" stepKey="clearFilters"/>
64+
<grabTextFrom selector="{{AdminOrdersGridSection.orderIdByIncrementId($createCustomerCart.return$)}}" stepKey="grabOrderId"/>
65+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrdersGridById">
66+
<argument name="orderId" value="{$grabOrderId}"/>
67+
</actionGroup>
68+
69+
<actionGroup ref="AdminOpenAndFillCreditMemoRefundActionGroup" stepKey="fillCreditMemoRefund">
70+
<argument name="itemQtyToRefund" value="1"/>
71+
<argument name="shippingRefund" value="0"/>
72+
<argument name="adjustmentRefund" value="5"/>
73+
<argument name="adjustmentFee" value="10"/>
74+
</actionGroup>
75+
76+
<actionGroup ref="AdminClickRefundOfflineOnCreditMemoDetailPageActionGroup" stepKey="clickRefundOffline"/>
77+
78+
<actionGroup ref="AdminOpenCreditMemoFromOrderPageActionGroup" stepKey="openCreditMemo"/>
79+
80+
<actionGroup ref="AssertAdminCreditMemoViewPageTotalsActionGroup" stepKey="assertCreditMemoViewPageTotals">
81+
<argument name="subtotal" value="$560.00"/>
82+
<argument name="adjustmentRefund" value="$5.00"/>
83+
<argument name="adjustmentFee" value="$10.00"/>
84+
<argument name="grandTotal" value="$555.00"/>
85+
</actionGroup>
86+
87+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
88+
<argument name="Customer" value="$$createCustomer$$"/>
89+
</actionGroup>
90+
91+
<actionGroup ref="StorefrontGoToCustomerOrderDetailsPageActionGroup" stepKey="openOrderDetailPage">
92+
<argument name="orderId" value="$createCustomerCart.return$"/>
93+
<argument name="orderNumber" value="{$grabOrderId}"/>
94+
</actionGroup>
95+
96+
<actionGroup ref="StorefrontClickRefundTabCustomerOrderViewActionGroup" stepKey="clickRefund"/>
97+
<see selector="{{StorefrontCustomerOrderSection.grandTotalRefund}}" userInput="555.00" stepKey="seeGrandTotal"/>
98+
</test>
99+
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoWithCashOnDeliveryTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="AdminCreateCreditMemoWithCashOnDeliveryTest">
11+
<test name="AdminCreateCreditMemoWithCashOnDeliveryTest" deprecated="Use AdminCreateCreditMemoForOrderWithCashOnDeliveryTest instead">
1212
<annotations>
1313
<stories value="Credit memo entity"/>
14-
<title value="Create Credit Memo with cash on delivery payment method"/>
14+
<title value="DEPRECATED. Create Credit Memo with cash on delivery payment method"/>
1515
<description value="Create Credit Memo with cash on delivery payment and assert 0 shipping refund"/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="MC-15863"/>
1818
<group value="sales"/>
1919
<group value="mtf_migrated"/>
20+
<skip>
21+
<issueId value="DEPRECATED">Use AdminCreateCreditMemoForOrderWithCashOnDeliveryTest instead</issueId>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

0 commit comments

Comments
 (0)