Skip to content

Commit d261d24

Browse files
Karishmathakare19Karishmathakare19
committed
Merge branch 'ACQE-8110' into ACQE-functional-deployment-v1
2 parents 536edc2 + 990f58b commit d261d24

10 files changed

+26
-24
lines changed

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/CreatePayPalOrderWithSelectedPaymentMethodActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2019 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/DummyDataActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<waitForPageLoad stepKey="waitForPayPalPageToLoad"/>
1717
<waitForElementVisible selector="{{PayPalPaymentSection.email}}" stepKey="waitForEmailField" />
1818
<fillField selector="{{PayPalPaymentSection.email}}" userInput="orykh@adobe.com" stepKey="fillEmail"/>
19+
<click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
1920
<waitForElementVisible selector="{{PayPalPaymentSection.password}}" stepKey="waitForPasswordFieldToBeVisible" />
2021
<fillField selector="{{PayPalPaymentSection.password}}" userInput="123123qQ1" stepKey="fillPassword"/>
2122
<waitForElementClickable selector="{{PayPalPaymentSection.loginBtn}}" stepKey="waitForLoginField"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -19,6 +19,7 @@
1919
<waitForPageLoad stepKey="waitForPayPalPageToLoad"/>
2020
<waitForElementVisible selector="{{PayPalPaymentSection.email}}" stepKey="waitForEmailField" />
2121
<fillField selector="{{PayPalPaymentSection.email}}" userInput="{{credentials.magento/PAYPAL_LOGIN}}" stepKey="fillEmail"/>
22+
<click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
2223
<waitForElementVisible selector="{{PayPalPaymentSection.password}}" stepKey="waitForPasswordFieldToBeVisible" />
2324
<fillField selector="{{PayPalPaymentSection.password}}" userInput="{{credentials.magento/PAYPAL_PWD}}" stepKey="fillPassword"/>
2425
<waitForElementClickable selector="{{PayPalPaymentSection.loginBtn}}" stepKey="waitForLoginField"/>

‎app/code/Magento/Paypal/Test/Mftf/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<element name="productQuantityInCartBlock" type="text" selector="//div[@class='details-qty']/span[@class='value']" />
7575
<element name="productChargedFor" type="text" selector="tr.totals.charge span.price"/>
7676
<element name="productCharged" type="text" selector="//tr[@class='grand totals']//span[@class='price' and contains(text(),'HK$')]"/>
77-
<element name="reviewOrder" type="button" selector="//div//button[text()='Continue to Review Order']"/>
77+
<element name="reviewOrder" type="button" selector="//button[.//span[normalize-space(text())='Review Order']]"/>
7878
<element name="checkoutWithPaypal" type="button" selector="(//div[@class='cart-container']//input[@data-action='checkout-form-submit'])[1]" timeout="30"/>
7979
</section>
8080
</sections>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2020 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -13,26 +13,26 @@
1313
<element name="existingAccountLoginBtn" type="input" selector="#loginSection a"/>
1414
<element name="email" type="input" selector="//input[contains(@name, 'email') and not(contains(@style, 'display:none'))]"/>
1515
<element name="password" type="input" selector="//input[contains(@name, 'password') and not(contains(@style, 'display:none'))]"/>
16-
<element name="loginBtn" type="input" selector="button#btnLogin"/>
16+
<element name="loginBtn" type="input" selector="//button[normalize-space(text())='Log In']"/>
1717
<element name="reviewUserInfo" type="text" selector="[data-testid=personalized-banner-content]"/>
1818
<element name="cartIcon" type="text" selector="[data-testid='header-show-cart-dropdown-btn']"/>
1919
<element name="itemName" type="text" selector="//p[contains(@class,'CartDropdown_line') and text()='{{productName}}']" parameterized="true"/>
20-
<element name="paypalSubmitBtn" type="text" selector="#payment-submit-btn"/>
21-
<element name="nextButton" type="button" selector="#btnNext"/>
20+
<element name="paypalSubmitBtn" type="text" selector="//button[(@id='one-time-cta' and @data-atomic-wait-domain='xo') or @data-testid='submit-button-initial' or @data-id='payment-submit-btn']"/>
21+
<element name="nextButton" type="button" selector="//button[normalize-space(text())='Next']"/>
2222
<element name="continueButton" type="button" selector=".continueButton"/>
2323
<element name="userName" type="text" selector="#reviewUserInfo"/>
2424
<element name="notYouLink" type="input" selector="#backToInputEmailLink"/>
2525
<element name="shippingMethod" type="text" selector="#shippingMethodCharge > span.selectedShippingMethod"/>
2626
<element name="paypalCart" type="text" selector="#transactionCart"/>
2727
<element name="productNamePosition" type="text" selector=".itemName"/>
28-
<element name="orderTotalOnPaypalCheckout" type="text" selector="//div[@id='cart']//span[contains(text(),'$')]"/>
28+
<element name="orderTotalOnPaypalCheckout" type="text" selector="//button[(@id='one-time-cta' and @data-atomic-wait-domain='xo') or @data-testid='submit-button-initial' or @data-id='payment-submit-btn']//div[starts-with(normalize-space(text()), '$')]"/>
2929
<element name="subtotal" type="text" selector="//div[@data-testid='line-item-subtotal']//span[contains(text(),'{{subtotal}}')]" parameterized="true"/>
3030
<element name="shipping" type="text" selector="//div[@data-testid='line-item-shipping']//span[contains(text(),'{{shippingAmount}}')]" parameterized="true"/>
3131
<element name="total" type="text" selector="//span[@data-testid='cart-sheet-total']"/>
3232
<element name="shippingAddress" type="text" selector="//div[@data-testid='shipping-address']/p[@data-testid='ship-to-address']"/>
3333
<element name="close" type="button" selector="//button[@aria-label='Close']"/>
34-
<element name="paypalPopupButton1" type="button" selector="//button[text()='Pay with Debit or Credit Card']"/>
35-
<element name="paypalPopupButton2" type="button" selector="//button[text()='Create an Account']"/>
34+
<element name="paypalPopupButton1" type="button" selector="//button[span[text()='Pay with Debit or Credit Card']]"/>
35+
<element name="paypalPopupButton2" type="button" selector="//button[span[text()='Create an Account']]"/>
3636
<element name="changeShippingAddressButton" type="button" selector="#change-shipping"/>
3737
<element name="shippingAddressDropdown" type="select" selector="#shippingDropdown"/>
3838
<element name="selectedShippingAddress" type="text" selector="//div/p[contains(text(), '{{selectedAddress}}')]" parameterized="true"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCancelledPaymentStandardOrderTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -53,7 +53,7 @@
5353
<!-- Click on PayPal payment radio button and click on continue btn -->
5454
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinueButton"/>
5555
<!-- Login to PayPal in-context and verify order total on PayPal page-->
56-
<actionGroup ref="StorefrontLoginToPayPalStandardPaymentActionGroup" stepKey="loginToPayPal"/>
56+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
5757
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
5858
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="waitForOrderNumberToBeGrabbed"/>
5959
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCompleteOrderPaidWithPayPalStandardTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,7 +51,7 @@
5151
<!-- Click on PayPal payment radio button and click on continue btn -->
5252
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinuebtn"/>
5353
<!-- Login to Paypal in-context and verify order total on paypal page-->
54-
<actionGroup ref="StorefrontLoginToPayPalStandardPaymentActionGroup" stepKey="loginToPayPal"/>
54+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
5555
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
5656
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>
5757
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCreatePartialCaptureOrderWithPaypalStandardTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Click on PayPal payment radio button and click on continue btn -->
5555
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinuebtn"/>
5656
<!-- Login to Paypal in-context and verify order total on paypal page-->
57-
<actionGroup ref="DummyDataActionGroup" stepKey="loginToPayPal"/>
57+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
5858
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
5959
<waitForText selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
6060
<waitForText selector="{{CheckoutSuccessMainSection.success}}" userInput="We'll email you an order confirmation with details and tracking info." stepKey="seeSuccessMessage"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCreateRefundOrderPaidWithPayPalStandardTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -51,7 +51,7 @@
5151
<!-- Click on PayPal payment radio button and click on continue btn -->
5252
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinuebtn"/>
5353
<!-- Login to Paypal in-context and verify order total on paypal page-->
54-
<actionGroup ref="StorefrontLoginToPayPalStandardActionGroup" stepKey="loginToPayPal"/>
54+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
5555
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
5656
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>
5757
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>

‎app/code/Magento/Paypal/Test/Mftf/Test/StorefrontGuestCheckoutUsingPayPalPaymentsStandardAndFlatRateTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<!-- Click on PayPal payment radio button and click on continue btn -->
130130
<actionGroup ref="AdminSelectPaypalStandardPaymentInPaymentPageGuestCheckoutActionGroup" stepKey="selectPaypalStandardPaymentAndClickOnContinuebtn"/>
131131
<!-- Login to Paypal in-context and verify order total on paypal page-->
132-
<actionGroup ref="StorefrontLoginToPayPalStandardPaymentGuestCheckoutActionGroup" stepKey="loginToPayPal"/>
132+
<actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="loginToPayPal"/>
133133
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
134134
<waitForElementVisible selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="waitForOrderNumberToBeGrabbed"/>
135135
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>

0 commit comments

Comments
 (0)