Skip to content

Commit 6fc7b08

Browse files
ACQE-5761: review comments added
1 parent 427904f commit 6fc7b08

File tree

3 files changed

+30
-11
lines changed

3 files changed

+30
-11
lines changed

app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyShippingMethodIsVisibilityOrNotActionGroup.xml renamed to app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckForFlatRateShippingMethodAvailabilityActionGroup.xml

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

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="VerifyShippingMethodIsVisibilityOrNotActionGroup">
11+
<actionGroup name="CheckForFlatRateShippingMethodAvailabilityActionGroup">
1212
<annotations>
1313
<description>Validates that the Shipping method is visible in the checkout page or not.</description>
1414
</annotations>
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="StorefrontShippingPageRedirectActionGroup">
12+
<annotations>
13+
<description>Goes to the Shipping page</description>
14+
</annotations>
15+
<amOnPage url="{{CheckoutShippingPage.url}}" stepKey="goToShippingPage"/>
16+
</actionGroup>
17+
</actionGroups>
Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="StorefrontGuestCheckoutForAvailableShippingRateChangeToInputDataTest">
10+
<test name="StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest">
1111
<annotations>
1212
<features value="Checkout"/>
13-
<stories value="Checkout via Guest Checkout"/>
13+
<stories value="Shipping rate in Guest Checkout"/>
1414
<title value="Guest Checkout - guest should be able to see the change in the shipping rate on fly."/>
1515
<description value="Should be able to change the shipping rate while changing the input data based on the specific country and zipcode."/>
16-
<severity value="AVERAGE"/>
16+
<severity value="CRITICAL"/>
1717
<testCaseId value="AC-6139"/>
1818
</annotations>
1919
<before>
@@ -52,34 +52,36 @@
5252
<argument name="state" value="California"/>
5353
<argument name="postcode" value="90034"/>
5454
</actionGroup>
55-
</before>
5655
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCachePostChangingConfigurationSettings">
5756
<argument name="tags" value="config"/>
5857
</actionGroup>
5958
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexPostChangingConfigurationSettings">
60-
<argument name="indices" value=""/>
59+
<argument name="indices" value="cataloginventory_stock catalog_product_price"/>
6160
</actionGroup>
61+
</before>
6262
<!-- Go to storefront page to add product -->
6363
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
6464
<waitForPageLoad stepKey="waitForProductPage"/>
6565
<!-- Add Simple product in the cart -->
6666
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
6767
<argument name="product" value="$createSimpleProduct$"/>
6868
</actionGroup>
69-
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
69+
<actionGroup ref="StorefrontShippingPageRedirectActionGroup" stepKey="goToShippingPage"/>
7070
<!-- Guest checkout -->
7171
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="goToShippingAndFillDetails">
7272
<argument name="customerAddress" value="US_CA_Address"/>
7373
</actionGroup>
7474
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="California" stepKey="fillStateField"/>
7575
<waitForPageLoad stepKey="waitForChangeAfterStateLoad"/>
76-
<actionGroup ref="VerifyShippingMethodIsVisibilityOrNotActionGroup" stepKey="verifyShippingMethod"/>
76+
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethod"/>
7777
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisible"/>
7878
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlWorldWideExpress}}" stepKey="waitForDHLPriceNotVisibleAfterStateChange"/>
79+
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingNotVisible"/>
80+
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelNotVisible"/>
7981
<!-- Change country value -->
8082
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="Afghanistan" stepKey="fillCountryField"/>
8183
<waitForPageLoad stepKey="waitForChangeAfterCountryLoad"/>
82-
<actionGroup ref="VerifyShippingMethodIsVisibilityOrNotActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
84+
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterCountryChange"/>
8385
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterCountryChange"/>
8486
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterCountryChange"/>
8587
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.shippingMethodDhlLabel}}" stepKey="waitForDHLLabelVisibleAfterCountryChange"/>
@@ -89,7 +91,7 @@
8991
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="United Kingdom" stepKey="fillCountry"/>
9092
<fillField selector="{{CheckoutShippingSection.city}}" userInput="London" stepKey="fillCity"/>
9193
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="N14 5JP" stepKey="fillPostcode"/>
92-
<actionGroup ref="VerifyShippingMethodIsVisibilityOrNotActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
94+
<actionGroup ref="CheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyShippingMethodAfterNewData"/>
9395
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShipping}}" stepKey="waitForFreeShippingVisibleAfterNewFormData"/>
9496
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="waitForFreeShippingLabelVisibleAfterNewFormData"/>
9597
<actionGroup ref="VerifyDHLShippingMethodIsVisibilityActionGroup" stepKey="dhlShippingVisibility"/>
@@ -105,7 +107,7 @@
105107
<actionGroup ref="AdminDisableFreeShippingActionGroup" stepKey="resetFreeShippingConfig"/>
106108
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="resetSaveConfiguration"/>
107109
<!-- Reset dhl configuration origin -->
108-
<actionGroup ref="AdminDHLConfigurationActionGroup" stepKey="resetDhlConfig"/>
110+
<actionGroup ref="AdminDisableDHLConfigurationActionGroup" stepKey="resetDhlConfig"/>
109111
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="resetSaveConfigurationForDHL"/>
110112
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
111113
</after>

0 commit comments

Comments
 (0)