Merge branch 'ACQE-7511' into ACQE-Version1-functional-mainline-deployment

Author: chandrakalahanchinal

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

@@ -37,6 +37,7 @@
         <element name="shippingMethodFreeShippingLabel" type="text" selector="#label_carrier_freeshipping_freeshipping"/>
         <element name="shippingDHLErrorMessage" type="text" selector="#checkout-shipping-method-load .table-checkout-shipping-method tr.row-error .error div"/>
         <element name="smartPostShippingMethod" type="radio" selector="#checkout-shipping-method-load input[value='fedex_SMART_POST']"/>
+        <element name="groundShippingMethod" type="radio" selector="#checkout-shipping-method-load input[value='fedex_FEDEX_GROUND']"/>
         <element name="shippingMethodDhlExpressEasyLabel" type="text" selector="#label_method_8_dhl"/>
         <element name="shippingMethodFedexLabel" type="text" selector="#label_carrier_null_fedex"/>
         <element name="smartPostFedexPrice" type="text" selector="//tr[td[@id='label_carrier_SMART_POST_fedex']]//td[contains(@class, 'col-price')]//span[contains(@class, 'price') and contains(@data-bind, 'price_excl_tax')]"/>

app/code/Magento/Shipping/Test/Mftf/Test/AdminCreateShippingLabelForFedExShipmentTest.xml

@@ -116,8 +116,9 @@
             </actionGroup>
             <!-- Go to Checkout Page -->
             <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="goToCheckout"/>
-            <waitForElementClickable selector="{{CheckoutShippingMethodsSection.smartPostShippingMethod}}" stepKey="waitForSelectFedexShippingMethod"/>
-            <click selector="{{CheckoutShippingMethodsSection.smartPostShippingMethod}}" stepKey="selectFedexShippingMethod"/>
+            <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSelectFedexShippingMethod"/>
+            <conditionalClick selector="{{CheckoutShippingMethodsSection.smartPostShippingMethod}}" dependentSelector="{{CheckoutShippingMethodsSection.smartPostShippingMethod}}" visible="true" stepKey="selectFedexShippingMethod"/>
+            <conditionalClick selector="{{CheckoutShippingMethodsSection.groundShippingMethod}}" dependentSelector="{{CheckoutShippingMethodsSection.groundShippingMethod}}" visible="true" stepKey="selectFedexShippingMethodGround"/>
             <actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
             <!-- Click on PayPal payment radio button -->
             <waitForElementClickable selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="waitForPayPalRadioButton"/>