Skip to content

Commit 748481c

Browse files
okolesnykokolesnyk
committed
MFTF Stability control
 - remove usage of deprecated Action Group
1 parent 34a9bee commit 748481c

6 files changed

+47
-6
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckoutForwardFromShippingStepActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<annotations>
1313
<description>Clicks next on Checkout Shipping step</description>
1414
</annotations>
15-
<waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
15+
<waitForElementClickable selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
1616
<click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
1717
</actionGroup>
1818
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippmentFromActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</annotations>
1616

1717
<!-- [DO NOT USE!] This action group must not be used because it violated Technical guidelines on how to write tests. -->
18+
<!-- Instead use combination of FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup, StorefrontSetShippingMethodActionGroup, StorefrontCheckoutClickNextOnShippingStepActionGroup -->
1819

1920
<fillField selector="{{CheckoutShippingSection.emailAddress}}" userInput="{{CustomerEntityOne.email}}" stepKey="setCustomerEmail"/>
2021
<fillField selector="{{CheckoutShippingSection.firstName}}" userInput="{{CustomerEntityOne.firstname}}" stepKey="SetCustomerFirstName"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckZeroSubtotalOrderIsInProcessingStatusTest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,17 @@
6262

6363
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="clickToProceedToCheckout"/>
6464

65-
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
65+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormData">
66+
<argument name="customer" value="CustomerEntityOne"/>
67+
<argument name="customerAddress" value="CustomerAddressSimple"/>
68+
</actionGroup>
69+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="shipmentFormFreeShippingActionGroup">
70+
<argument name="shippingMethodName" value="Free Shipping"/>
71+
</actionGroup>
72+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButtonOnShippingPage" />
73+
<waitForPageLoad stepKey="waitForPaymentLoading"/>
74+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
75+
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
6676

6777
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
6878
<argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckZeroSubtotalOrderWithCustomStatus.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,17 @@
9999
<actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="clickToProceedToCheckout"/>
100100
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodSelectorNextButton}}" stepKey="waitForNextButtonVisible" />
101101

102-
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
102+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormData">
103+
<argument name="customer" value="CustomerEntityOne"/>
104+
<argument name="customerAddress" value="CustomerAddressSimple"/>
105+
</actionGroup>
106+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="shipmentFormFreeShippingActionGroup">
107+
<argument name="shippingMethodName" value="Free Shipping"/>
108+
</actionGroup>
109+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButtonOnShippingPage" />
110+
<waitForPageLoad stepKey="waitForPaymentLoading"/>
111+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
112+
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
103113

104114
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
105115
<argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckZeroSubtotalOrderWithGeneratedInvoiceTest.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,17 @@
6363

6464
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="clickToProceedToCheckout"/>
6565

66-
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
66+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormData">
67+
<argument name="customer" value="CustomerEntityOne"/>
68+
<argument name="customerAddress" value="CustomerAddressSimple"/>
69+
</actionGroup>
70+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="shipmentFormFreeShippingActionGroup">
71+
<argument name="shippingMethodName" value="Free Shipping"/>
72+
</actionGroup>
73+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButtonOnShippingPage" />
74+
<waitForPageLoad stepKey="waitForPaymentLoading"/>
75+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
76+
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
6777

6878
<actionGroup ref="StorefrontApplyDiscountCodeActionGroup" stepKey="applyDiscountCoupon">
6979
<argument name="discountCode" value="$createCartPriceRuleCoupon.code$"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/ZeroSubtotalOrdersWithProcessingStatusTest.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<group value="checkout"/>
2020
<skip>
2121
<issueId value="DEPRECATED">Use AdminCheckZeroSubtotalOrderIsInProcessingStatusTest instead</issueId>
22-
</skip>
22+
</skip>
2323
</annotations>
2424
<before>
2525
<createData entity="SimpleSubCategory" stepKey="simplecategory"/>
@@ -74,7 +74,17 @@
7474
<waitForPageLoad stepKey="waitForTheFormIsOpened"/>
7575

7676
<!--Fill shipping form-->
77-
<actionGroup ref="ShipmentFormFreeShippingActionGroup" stepKey="shipmentFormFreeShippingActionGroup"/>
77+
<actionGroup ref="FillGuestCheckoutShippingAddressWithCountryAndStateActionGroup" stepKey="fillShippingFormData">
78+
<argument name="customer" value="CustomerEntityOne"/>
79+
<argument name="customerAddress" value="CustomerAddressSimple"/>
80+
</actionGroup>
81+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="shipmentFormFreeShippingActionGroup">
82+
<argument name="shippingMethodName" value="Free Shipping"/>
83+
</actionGroup>
84+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNextButtonOnShippingPage" />
85+
<waitForPageLoad stepKey="waitForPaymentLoading"/>
86+
<waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
87+
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
7888

7989
<click selector="{{DiscountSection.DiscountTab}}" stepKey="clickToAddDiscount"/>
8090
<fillField selector="{{DiscountSection.DiscountInput}}" userInput="{{_defaultCoupon.code}}" stepKey="TypeDiscountCode"/>

0 commit comments

Comments
 (0)