Merge branch 'ACQE-5849-2' into ACQE-functional-deployment-v3-3

Author: Karishmathakare19

app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalExpressCheckoutEnableWithOutContextActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminPayPalExpressCheckoutEnableWithOutContextActionGroup" extends="AdminPayPalExpressCheckoutEnableActionGroup">
+        <annotations>
+            <description>Extends AdminPayPalExpressCheckoutEnableActionGroup to configure the In-Context Checkout setting for PayPal Express Checkout.</description>
+        </annotations>
+        <arguments>
+            <argument name="enableInContext" type="string" defaultValue="Yes"/>
+        </arguments>
+        <selectOption selector="{{PayPalExpressCheckoutConfigSection.enableInContext(countryCode)}}" userInput="{{enableInContext}}" stepKey="enableInContext" after="inputMerchantID"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup.xml

@@ -20,6 +20,8 @@
         <waitForElementVisible selector="{{PayPalPaymentSection.email}}" stepKey="waitForEmailField" />
         <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{credentials.magento/PAYPAL_LOGIN}}" stepKey="fillEmail"/>
         <click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForNextPageLoad"/>
+        <conditionalClick selector="{{PayPalPaymentSection.usePasswordInsteadButton}}" dependentSelector="{{PayPalPaymentSection.password}}" visible="false" stepKey="clickUsePasswordInsteadIfPasswordFieldNotVisible"/>
         <waitForElementVisible selector="{{PayPalPaymentSection.password}}" stepKey="waitForPasswordFieldToBeVisible" />
         <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{credentials.magento/PAYPAL_PWD}}" stepKey="fillPassword"/>
         <waitForElementClickable selector="{{PayPalPaymentSection.loginBtn}}" stepKey="waitForLoginField"/>

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml

@@ -23,6 +23,8 @@
         <clearField selector="{{PayPalPaymentSection.email}}" stepKey="clearEmailField"/>
         <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{credentials.magento/PAYPAL_LOGIN}}" stepKey="fillEmail"/>
         <click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
+        <waitForPageLoad stepKey="waitForNextPageLoad"/>
+        <conditionalClick selector="{{PayPalPaymentSection.usePasswordInsteadButton}}" dependentSelector="{{PayPalPaymentSection.password}}" visible="false" stepKey="clickUsePasswordInsteadIfPasswordFieldNotVisible"/>
         <waitForElementVisible selector="{{PayPalPaymentSection.password}}" stepKey="waitForPasswordField"/>
         <click selector="{{PayPalPaymentSection.password}}" stepKey="focusOnPasswordField"/>
         <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{credentials.magento/PAYPAL_PWD}}" stepKey="fillPassword"/>

app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection/PayPalPaymentSection.xml

@@ -37,5 +37,6 @@
         <element name="changeShippingAddressButton" type="button" selector="//button[@data-dd-action-name='Ship to Tab']"/>
         <element name="shippingAddressDropdown" type="select" selector="(//div[@data-dd-action-name='Shipping Address'][.//span[contains(normalize-space(.), '{{ShippingAddress}}')]])[1]" parameterized="true"/>
         <element name="selectedShippingAddress" type="text" selector="//div/p[contains(text(), '{{selectedAddress}}')]" parameterized="true"/>
+        <element name="usePasswordInsteadButton" type="button" selector="//button[text()='Use Password Instead']"/>
     </section>
 </sections>