Skip to content

Commit 76117e1

Browse files
Merge branch 'ACQE-8362' into ACQE-functional-deployment-version15
2 parents a1c9a8b + f66d752 commit 76117e1

File tree

3 files changed

+6
-60
lines changed

3 files changed

+6
-60
lines changed

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

Lines changed: 0 additions & 59 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@
5656
<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')]"/>
5757
<element name="standardOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_STANDARD_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Standard Overnight')]"/>
5858
<element name="priorityOvernightFedexMethod" type="text" selector="//tr[td[@id='label_method_PRIORITY_OVERNIGHT_fedex']]//td[contains(@class, 'col-method') and contains(text(), 'Priority Overnight')]"/>
59+
<element name="fedexExpressShipping" type="text" selector="//tr[td[@class='col col-carrier' and normalize-space(text())='Federal Express'] and number(translate(normalize-space(td[@class='col col-price']), '$', '')) > 0]"/>
5960
</section>
6061
</sections>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
</actionGroup>
6969
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodFreeShippingLabel}}" stepKey="againWaitForFreeShippingLabelNotVisible"/>
7070
<actionGroup ref="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup" stepKey="verifyFlatRateShippingMethodAfterCountryChangeToUS"/>
71-
<actionGroup ref="StorefrontVerifyFedexShippingMethodPricesActionGroup" stepKey="verifyFedexShippingMethodPrices"/>
71+
<executeJS function="return document.evaluate(&quot;{{CheckoutShippingMethodsSection.fedexExpressShipping}}&quot;, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null).snapshotLength" stepKey="federalExpressCount"/>
72+
<assertGreaterThanOrEqual stepKey="verifyFedexShippingMethodPrices">
73+
<actualResult type="const">$federalExpressCount</actualResult>
74+
<expectedResult type="const">1</expectedResult>
75+
</assertGreaterThanOrEqual>
7276
</test>
7377
</tests>

0 commit comments

Comments
 (0)