Skip to content

Commit 33399b6

Browse files
manjusha729manjusha729
committed
AC-5667:Default configuration for Paypal Pay Later Message on Checkout Page
conflicts fix
2 parents a38a071 + c5960b1 commit 33399b6

File tree

4 files changed

+92
-14
lines changed

4 files changed

+92
-14
lines changed

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminEnablePaypalPaylaterConfigurationActionGroup" >
11+
<annotations>
12+
<description>Enable Paypal Paylater Solution For Paypal Express Checkout</description>
13+
</annotations>
14+
<waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="waitForConfigureButtonToClickable"/>
15+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn('us')}}" stepKey="configureButtonClicked"/>
16+
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLater('us')}}" userInput="Yes" stepKey="enablepaylaterExp"/>
17+
<waitForPageLoad stepKey="waitForAdvisePageLoad"/>
18+
<waitForElementClickable selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown('us')}}" stepKey="waitForPayLaterDropdownClickable"/>
19+
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown('us')}}" stepKey="advertisePaylateToClicked"/>
20+
<waitForPageLoad stepKey="waitForAdvisePaylaterDropdown"/>
21+
<selectOption selector ="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn('us')}}" userInput="Yes" stepKey="enablePaypalLater"/>
22+
<waitForElementClickable selector="{{AdminConfigPaypalCartPagePaylaterSection.expandCheckoutCartPage('us')}}" stepKey="waitForCheckoutCartpageClickable"/>
23+
<click selector="{{AdminConfigPaypalCartPagePaylaterSection.expandCheckoutCartPage('us')}}" stepKey="clickCheckoutCart"/>
24+
<selectOption selector ="{{AdminConfigPaypalCartPagePaylaterSection.display('us')}}" userInput="Yes" stepKey="enableDisplayforPaylaterCartpage"/>
25+
<seeOptionIsSelected selector="{{AdminConfigPaypalCartPagePaylaterSection.position('us')}}" userInput="Header (center)" stepKey="seeSelectedPosition"/>
26+
<seeOptionIsSelected selector="{{AdminConfigPaypalCartPagePaylaterSection.styleLayout('us')}}" userInput="Text" stepKey="seeSelectedStyleLayout"/>
27+
<seeOptionIsSelected selector="{{AdminConfigPaypalCartPagePaylaterSection.logoType('us')}}" userInput="Primary" stepKey="seeSelectedLogoType"/>
28+
<seeOptionIsSelected selector="{{AdminConfigPaypalCartPagePaylaterSection.logoPosition('us')}}" userInput="Left" stepKey="seeSelectedLogoPosition"/>
29+
<seeOptionIsSelected selector="{{AdminConfigPaypalCartPagePaylaterSection.textColor('us')}}" userInput="Black" stepKey="seeSelectedTextColor"/>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminConfigPaypalCartPagePaylaterSection">
11+
<element name="expandCheckoutCartPage" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage-head" parameterized="true"/>
12+
<element name="display" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_display" parameterized="true"/>
13+
<element name="position" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_position" parameterized="true"/>
14+
<element name="styleLayout" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_stylelayout" parameterized="true" />
15+
<element name="logoType" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_logotype" parameterized="true" />
16+
<element name="logoPosition" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_logoposition" parameterized="true" />
17+
<element name="textColor" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_cartpage_paylater_cartpage_textcolor" parameterized="true" />
18+
</section>
19+
</sections>

‎app/code/Magento/Paypal/Test/Mftf/Suite/ConfigurePaypalPaylaterSuite.xml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
9+
<suite name="ConfigurePaypalPaylaterSuite">
10+
<before>
11+
<!-- Login -->
12+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
13+
<actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="ConfigPayPalExpress">
14+
<argument name="credentials" value="SamplePaypalExpressConfig2"/>
15+
</actionGroup>
16+
<!--Enable Paylater Solution On Admin Cart Page -->
17+
<actionGroup ref="AdminEnablePaypalPaylaterConfigurationActionGroup" stepKey="enablePaylaterOnAdminCartConfiguration">
18+
</actionGroup>
19+
<!--Click on Save configure Button -->
20+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration">
21+
</actionGroup>
22+
</before>
23+
<after>
24+
<!-- Cleanup Paypal configurations -->
25+
<magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
26+
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
27+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanFullPageCache">
28+
<argument name="tags" value="config full_page"/>
29+
</actionGroup>
30+
</after>
31+
<include>
32+
<group name="paypalPayLater"/>
33+
</include>
34+
</suite>
35+
</suites>

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

Lines changed: 7 additions & 14 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 2024 Adobe
55
* All Rights Reserved.
66
*/
77
-->
@@ -11,28 +11,21 @@
1111
<annotations>
1212
<features value="PayPal"/>
1313
<stories value="Payment methods"/>
14-
<title value="Default configuration for Paypal pay later"/>
14+
<title value="Default configuration for paypalpaylater"/>
1515
<description value="Paypal Pay Later Message should display on Admin Cart Page configuration"/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="AC-5644"/>
18-
<group value="pr_exclude"/>
18+
<group value="paypalPayLater"/>
1919
<group value="3rd_party_integration"/>
20+
<group value="pr_exclude"/>
2021
</annotations>
2122
<before>
22-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23-
<actionGroup ref="AdminPayPalExpressCheckoutEnableActionGroup" stepKey="ConfigPayPalExpress">
24-
<argument name="credentials" value="SamplePaypalExpressConfig2"/>
25-
</actionGroup>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
2624
</before>
2725
<after>
28-
<magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePayPalExpress"/>
29-
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
3026
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
3127
</after>
32-
<actionGroup ref="AdminConfigurePaypalPaylaterEnableActionGroup" stepKey="enablePaypalPaylaterSolution"/>
33-
<!--Check default values selected in dropdown -->
34-
<actionGroup ref="AssertAdminConfigForDefaultValuesInPaylaterCartPageActionGroup" stepKey="checkValuesForAdminCartConfiguration"/>
35-
<!--Click on Save configure Button -->
36-
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveAdminConfiguration"/>
28+
<!-- Navigate to StoreFront -->
29+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
3730
</test>
3831
</tests>

0 commit comments

Comments
 (0)