Skip to content

Commit 4923636

Browse files
manjusha729manjusha729
committed
Merge branch 'ACQE-7512' into ACQE-functional-mainline-deployment_Ver1
2 parents 41dbf5d + 8358c9c commit 4923636

File tree

3 files changed

+53
-29
lines changed

3 files changed

+53
-29
lines changed

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

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2024 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -12,22 +12,48 @@
1212
<annotations>
1313
<description>Validates that the Fedex Shipping method prices in the checkout page.</description>
1414
</annotations>
15-
<arguments>
16-
<argument name="smartPostPrice" type="string" defaultValue="$17.25"/>
17-
<argument name="groundPrice" type="string" defaultValue="$13.72"/>
18-
<argument name="expressSaverPrice" type="string" defaultValue="$37.97"/>
19-
<argument name="twoDayPrice" type="string" defaultValue="$44.11"/>
20-
<argument name="twoDayAMPrice" type="string" defaultValue="$50.91"/>
21-
<argument name="standardOvernightPrice" type="string" defaultValue="$90.31"/>
22-
<argument name="priorityOvernightPrice" type="string" defaultValue="$100.37"/>
23-
</arguments>
2415
<waitForPageLoad stepKey="waitForPageLoad2" />
25-
<waitForText selector="{{CheckoutShippingMethodsSection.smartPostFedexPrice}}" userInput="{{smartPostPrice}}" stepKey="waitForSmartPostPriceVisible"/>
26-
<waitForText selector="{{CheckoutShippingMethodsSection.groundFedexPrice}}" userInput="{{groundPrice}}" stepKey="waitForGroundPriceVisible"/>
27-
<waitForText selector="{{CheckoutShippingMethodsSection.expressSaverFedexPrice}}" userInput="{{expressSaverPrice}}" stepKey="waitForExpressPriceVisible"/>
28-
<waitForText selector="{{CheckoutShippingMethodsSection.twoDayFedexPrice}}" userInput="{{twoDayPrice}}" stepKey="waitForTwodayPriceVisible"/>
29-
<waitForText selector="{{CheckoutShippingMethodsSection.twoDayAMFedexPrice}}" userInput="{{twoDayAMPrice}}" stepKey="waitForTwodayAMPriceVisible"/>
30-
<waitForText selector="{{CheckoutShippingMethodsSection.standardOvernightFedexPrice}}" userInput="{{standardOvernightPrice}}" stepKey="waitForStandardPriceVisible"/>
31-
<waitForText selector="{{CheckoutShippingMethodsSection.priorityOvernightFedexPrice}}" userInput="{{priorityOvernightPrice}}" stepKey="waitForOvernightPriceVisible"/>
16+
<waitForElement selector="{{CheckoutShippingMethodsSection.smartPostFedexMethod}}" stepKey="waitForSmartPostFedexMethod"/>
17+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.smartPostFedexPrice}}" stepKey="smartPostPrice"/>
18+
<assertRegExp stepKey="waitForSmartPostPriceVisible">
19+
<actualResult type="variable">$smartPostPrice</actualResult>
20+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
21+
</assertRegExp>
22+
<waitForElement selector="{{CheckoutShippingMethodsSection.groundFedexMethod}}" stepKey="waitForGroundFedexMethod"/>
23+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.groundFedexPrice}}" stepKey="groundFedexPrice"/>
24+
<assertRegExp stepKey="waitForGroundPriceVisible">
25+
<actualResult type="variable">$groundFedexPrice</actualResult>
26+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
27+
</assertRegExp>
28+
<waitForElement selector="{{CheckoutShippingMethodsSection.expressSaverFedexPrice}}" stepKey="waitForExpressSaverFedexMethod"/>
29+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.expressSaverFedexPrice}}" stepKey="expressSaverFedexPrice"/>
30+
<assertRegExp stepKey="waitForExpressPriceVisible">
31+
<actualResult type="variable">$expressSaverFedexPrice</actualResult>
32+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
33+
</assertRegExp>
34+
<waitForElement selector="{{CheckoutShippingMethodsSection.twoDayFedexMethod}}" stepKey="waitForRwoDayFedexMethod"/>
35+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.twoDayFedexPrice}}" stepKey="twoDayFedexPrice"/>
36+
<assertRegExp stepKey="waitForTwodayPriceVisible">
37+
<actualResult type="variable">$twoDayFedexPrice</actualResult>
38+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
39+
</assertRegExp>
40+
<waitForElement selector="{{CheckoutShippingMethodsSection.twoDayAMFedexMethod}}" stepKey="waitForTwoDayAMFedexMethod"/>
41+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.twoDayAMFedexPrice}}" stepKey="twoDayAMFedexPrice"/>
42+
<assertRegExp stepKey="waitForTwodayAMPriceVisible">
43+
<actualResult type="variable">$twoDayAMFedexPrice</actualResult>
44+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
45+
</assertRegExp>
46+
<waitForElement selector="{{CheckoutShippingMethodsSection.standardOvernightFedexMethod}}" stepKey="waitForStandardOvernightFedexMethod"/>
47+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.standardOvernightFedexPrice}}" stepKey="standardOvernightFedexPrice"/>
48+
<assertRegExp stepKey="waitForStandardPriceVisible">
49+
<actualResult type="variable">$standardOvernightFedexPrice</actualResult>
50+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
51+
</assertRegExp>
52+
<waitForElement selector="{{CheckoutShippingMethodsSection.priorityOvernightFedexMethod}}" stepKey="waitForPriorityOvernightFedexMethod"/>
53+
<grabTextFrom selector="{{CheckoutShippingMethodsSection.priorityOvernightFedexPrice}}" stepKey="priorityOvernightFedexPrice"/>
54+
<assertRegExp stepKey="waitForOvernightPriceVisible">
55+
<actualResult type="variable">$priorityOvernightFedexPrice</actualResult>
56+
<expectedResult type="string">\$([0-9]+(\.[0-9]+)?)$</expectedResult>
57+
</assertRegExp>
3258
</actionGroup>
3359
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2024 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -46,5 +46,12 @@
4646
<element name="twoDayAMFedexPrice" type="text" selector="//tr[td[@id='label_method_FEDEX_2_DAY_AM_fedex']]//td[contains(@class, 'col-price')]//span[contains(@class, 'price') and contains(@data-bind, 'price_excl_tax')]"/>
4747
<element name="standardOvernightFedexPrice" type="text" selector="//tr[td[@id='label_method_STANDARD_OVERNIGHT_fedex']]//td[contains(@class, 'col-price')]//span[contains(@class, 'price') and contains(@data-bind, 'price_excl_tax')]"/>
4848
<element name="priorityOvernightFedexPrice" type="text" selector="//tr[td[@id='label_method_PRIORITY_OVERNIGHT_fedex']]//td[contains(@class, 'col-price')]//span[contains(@class, 'price') and contains(@data-bind, 'price_excl_tax')]"/>
49+
<element name="smartPostFedexMethod" type="text" selector="//tr[td[@id='label_carrier_SMART_POST_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Smart Post')]"/>
50+
<element name="groundFedexMethod" type="text" selector="//tr[td[@id='label_method_FEDEX_GROUND_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Ground')]"/>
51+
<element name="expressSaverFedexMethod" type="text" selector="//tr[td[@id='label_method_FEDEX_EXPRESS_SAVER_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Express Saver')]"/>
52+
<element name="twoDayFedexMethod" type="text" selector="//tr[td[@id='label_method_FEDEX_2_DAY_fedex']]//td[contains(@class, 'col-method') and contains(text(), '2 Day')]"/>
53+
<element name="twoDayAMFedexMethod" type="text" selector="//tr[td[@id='label_method_FEDEX_2_DAY_AM_fedex']]//td[contains(@class, 'col-method') and contains(text(), '2 Day AM')]"/>
54+
<element name="standardOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_STANDARD_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Standard Overnight')]"/>
55+
<element name="priorityOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_PRIORITY_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Priority Overnight')]"/>
4956
</section>
5057
</sections>

‎app/code/Magento/Fedex/Test/Mftf/Test/StorefrontAssertAvailableShippingRateIsChangedBasedOnInputedDataTest.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright 2024 Adobe
4+
* Copyright 2025 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -16,7 +16,6 @@
1616
<description value="Testcase verifies On storefront Available shipping rate is changed on fly according to inputed data"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="AC-9283"/>
19-
<group value="pr_exclude"/>
2019
</annotations>
2120
<before>
2221
<createData entity="SimpleProduct" stepKey="createProduct">
@@ -68,14 +67,6 @@
6867
</actionGroup>
6968
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="againWaitForFreeShippingLabelNotVisible"/>
7069
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyFlatRateShippingMethodAfterCountryChangeToUS"/>
71-
<actionGroup ref="StorefrontVerifyFedexShippingMethodPricesActionGroup" stepKey="verifyFedexShippingMethodPrices">
72-
<argument name="smartPostPrice" value="$15.93"/>
73-
<argument name="groundPrice" value="$13.72"/>
74-
<argument name="expressSaverPrice" value="$35.87"/>
75-
<argument name="twoDayPrice" value="$42.01"/>
76-
<argument name="twoDayAMPrice" value="$48.81"/>
77-
<argument name="standardOvernightPrice" value="$88.21"/>
78-
<argument name="priorityOvernightPrice" value="$98.27"/>
79-
</actionGroup>
70+
<actionGroup ref="StorefrontVerifyFedexShippingMethodPricesActionGroup" stepKey="verifyFedexShippingMethodPrices"/>
8071
</test>
8172
</tests>

0 commit comments

Comments
 (0)