Skip to content

Commit 674a2f8

Browse files
Usik2203Usik2203
committed
add AdminOrderClickSubmitOrderActionGroup
1 parent 4930963 commit 674a2f8

21 files changed

+41
-49
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsTest.xml

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

153153
<click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
154154
<actionGroup ref="AdminCheckoutSelectCheckMoneyOrderBillingMethodActionGroup" stepKey="selectBillingMethod"/>
155-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="trySubmitOrder"/>
155+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="trySubmitOrder" />
156156

157157
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionField.title}}" stepKey="seeAdminOrderProductOptionField1" />
158158
<see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="{{ProductOptionArea.title}}" stepKey="seeAdminOrderProductOptionArea1"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<waitForPageLoad stepKey="waitForShippingMethods"/>
177177
<click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
178178
<waitForPageLoad stepKey="waitForShippingMethodLoad"/>
179-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
179+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
180180
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="checkOrderSuccessfullyCreated"/>
181181
</test>
182182
</tests>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminReportsOrderedGroupedBySkuTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<argument name="attribute" value="colorProductAttribute"/>
4646
<argument name="option" value="colorProductAttribute1"/>
4747
</actionGroup>
48-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitFirstOrder"/>
48+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitFirstOrder" />
4949

5050
<!--Add second configurable product to order-->
5151
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToSecondOrderWithExistingCustomer">
@@ -56,7 +56,7 @@
5656
<argument name="attribute" value="colorProductAttribute"/>
5757
<argument name="option" value="colorProductAttribute2"/>
5858
</actionGroup>
59-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitSecondOrder"/>
59+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitSecondOrder" />
6060

6161
<!-- Get date -->
6262
<generateDate stepKey="generateStartDate" date="-1 minute" format="m/d/Y"/>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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="AdminOrderClickSubmitOrderActionGroup">
12+
<annotations>
13+
<description>Click "Submit Order" button for order.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
17+
<waitForPageLoad stepKey="waitForOrderPageToLoad"/>
18+
</actionGroup>
19+
</actionGroups>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@
7272

7373
<!-- Select Free shipping -->
7474
<actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
75-
76-
<!--Click *Submit Order* button-->
77-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
75+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
7876

7977
<!--Click *Invoice* button-->
8078
<actionGroup ref="StartCreateInvoiceFromOrderPageActionGroup" stepKey="startCreateInvoice"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
<!-- Select bank Transfer payment method -->
6060
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
6161
<conditionalClick selector="{{AdminOrderFormPaymentSection.bankTransferOption}}" dependentSelector="{{AdminOrderFormPaymentSection.bankTransferOption}}" visible="true" stepKey="checkBankTransferOption"/>
62-
63-
<!-- Submit order -->
64-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
62+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6563

6664
<!-- Verify order information -->
6765
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
<!-- Select Cash On Delivery payment method -->
6060
<waitForElementVisible selector="{{AdminOrderFormPaymentSection.paymentBlock}}" stepKey="waitForPaymentOptions"/>
6161
<checkOption selector="{{AdminOrderFormPaymentSection.cashOnDeliveryOption}}" stepKey="selectCashOnDeliveryPaymentOption"/>
62-
63-
<!-- Submit order -->
64-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
62+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6563

6664
<!--Verify order information-->
6765
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
150150
<!-- Submit order -->
151151
<comment userInput="Submit order" stepKey="submitOrderComment"/>
152-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
152+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
153153
<!-- Verify order information -->
154154
<comment userInput="Verify order information" stepKey="verifyOrderInformationComment"/>
155155
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858

5959
<!--Select FlatRate shipping method-->
6060
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
61-
62-
<!--Submit order-->
63-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
61+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6462

6563
<!--Verify order information-->
6664
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>
@@ -109,7 +107,7 @@
109107
<!-- Reorder the product -->
110108
<click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickOnReorderButton"/>
111109
<waitForPageLoad stepKey="waitForReorderFormToLoad"/>
112-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder1"/>
110+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder1" />
113111

114112
<!-- Assert Simple Product Quantity in backend after Reorder -->
115113
<actionGroup ref="FilterAndSelectProductActionGroup" stepKey="filterAndSelectTheProduct2">

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
<fillField selector="{{AdminOrderFormPaymentSection.purchaseOrderNumber}}" userInput="{{PurchaseOrderNumber.number}}" stepKey="fillPurchaseOrderNumber"/>
7070
<click selector="{{AdminOrderFormActionSection.pageHeader}}" stepKey="clickOnHeader"/>
7171
<waitForPageLoad stepKey="waitForPageToLoad"/>
72-
73-
<!--Submit order-->
74-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
72+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
7573

7674
<!--Verify order information-->
7775
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060

6161
<!--Select FlatRate shipping method-->
6262
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
63-
64-
<!--Submit order-->
65-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
63+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6664

6765
<!--Verify order information-->
6866
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
<fillField selector="{{AdminOrderFormPaymentSection.fieldPurchaseOrderNumber}}" userInput="123456" stepKey="fillPONumber"/>
6262
<click selector="{{AdminOrderFormPaymentSection.blockPayment}}" stepKey="unfocus"/>
6363
<waitForPageLoad stepKey="waitForJavascriptToFinish"/>
64-
<click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="submitOrder"/>
65-
<waitForPageLoad stepKey="waitForSubmitOrderPage"/>
64+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6665
<see stepKey="seeSuccessMessageForOrder" selector="{{AdminIndexManagementSection.successMessage}}" userInput="You created the order."/>
6766

6867
<!-- Create Invoice -->

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@
9393

9494
<!--Select FlatRate shipping method-->
9595
<actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>
96-
97-
<!--Submit order-->
98-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
96+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
9997

10098
<!--Verify order information-->
10199
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@
6363
<see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal"/>
6464
<see selector="{{AdminOrderFormTotalSection.total('Shipping')}}" userInput="${{AdminOrderSimpleProduct.shipping}}" stepKey="seeOrderShipping"/>
6565
<see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal"/>
66-
67-
<!--Submit Order and verify information-->
68-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
66+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
6967
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
7068

7169
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@
5858
<!--Click *Get shipping methods and rates* and see that Free Shipping is absent-->
5959
<click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickGetShippingMehods"/>
6060
<dontSeeElement selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="seeAbsentFreeShipping"/>
61-
<!--Submit Order and verify that Order isn't placed-->
62-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
61+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
6362

6463
<dontSeeElement selector="{{AdminOrderFormMessagesSection.success}}" stepKey="seeSuccessMessage"/>
6564
<seeElement selector="{{AdminOrderFormMessagesSection.error}}" stepKey="seeErrorMessage"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@
6060

6161
<!--Select FlatRate shipping method-->
6262
<actionGroup ref="AdminSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
63-
64-
<!-- Submit order -->
65-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
63+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
6664

6765
<!-- Verify order information -->
6866
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@
114114

115115
<!-- Checkout select Check/Money Order payment -->
116116
<actionGroup ref="SelectCheckMoneyPaymentMethodActionGroup" stepKey="selectCheckMoneyPayment"/>
117-
118-
<!--Submit order-->
119-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
117+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
120118

121119
<!--Verify order information-->
122120
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Try to create order in admin with provided email -->
5555
<actionGroup ref="NavigateToNewOrderPageNewCustomerSingleStoreActionGroup" stepKey="navigateToNewOrderPage"/>
5656
<fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer_Incorrect_Email.email}}" stepKey="fillEmailAddressAdminPanel"/>
57-
<click selector="{{AdminOrderFormActionSection.submitOrder}}" stepKey="clickSubmitOrder"/>
57+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
5858

5959
<!-- Order can not be created -->
6060
<actionGroup ref="AssertAdminEmailValidationMessageOnCheckoutActionGroup" stepKey="assertErrorMessageAdminPanel"/>

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,7 @@
186186
<waitForPageLoad stepKey="waitForShippingMethods"/>
187187
<click selector="{{AdminOrderFormPaymentSection.freeShippingOption}}" stepKey="chooseShippingMethod"/>
188188
<waitForPageLoad stepKey="waitForPageToLoad"/>
189-
190-
<!-- Submit order -->
191-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
192-
<waitForPageLoad stepKey="waitForAdminOrderFormLoad"/>
189+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="submitOrder" />
193190

194191
<!-- Verify order information -->
195192
<actionGroup ref="VerifyCreatedOrderInformationActionGroup" stepKey="verifyCreatedOrderInformation"/>

‎app/code/Magento/Shipping/Test/Mftf/Test/AdminCreatePartialShipmentEntityTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
</actionGroup>
5252
<!-- Select Free shipping -->
5353
<actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
54-
<!--Click *Submit Order* button-->
55-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
54+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
5655
<!-- Create Partial Shipment -->
5756
<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
5857
<argument name="Qty" value="1"/>

‎app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShipmentEntityTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
</actionGroup>
5252
<!-- Select Free shipping -->
5353
<actionGroup ref="OrderSelectFreeShippingActionGroup" stepKey="selectFreeShippingOption"/>
54-
<!--Click *Submit Order* button-->
55-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
54+
<actionGroup ref="AdminOrderClickSubmitOrderActionGroup" stepKey="clickSubmitOrder" />
5655
<!-- Create Shipment -->
5756
<actionGroup ref="AdminCreateShipmentFromOrderPage" stepKey="createNewShipment">
5857
<argument name="Title" value="Title"/>

0 commit comments

Comments
 (0)