Skip to content

Commit 74bb1ec

Browse files
manjusha729manjusha729
committed
Merge branch 'ACQE-6570' into ACQE-7157-functional-tests-mainline-deployment
2 parents 007f481 + 6f251b8 commit 74bb1ec

6 files changed

+218
-0
lines changed

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminClearPaymentAdvancedDataActionGroup">
12+
<annotations>
13+
<description>Admin goes to payments advanced configuration and clears provided Sample PayPal credentials</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="countryCode" type="string" defaultValue="us"/>
17+
</arguments>
18+
<waitForPageLoad stepKey="waitForPageLoad1"/>
19+
<clearField selector ="{{AdminConfigPaymentsAdvancedSection.email(countryCode)}}" stepKey="clearInputEmailField"/>
20+
<clearField selector ="{{AdminConfigPaymentsAdvancedSection.partner(countryCode)}}" stepKey="clearInputPartnerField"/>
21+
<clearField selector ="{{AdminConfigPaymentsAdvancedSection.vendor(countryCode)}}" stepKey="clearInputVendorField"/>
22+
<clearField selector ="{{AdminConfigPaymentsAdvancedSection.user(countryCode)}}" stepKey="clearInputUsereField"/>
23+
<clearField selector ="{{AdminConfigPaymentsAdvancedSection.password(countryCode)}}" stepKey="clearInputPasswordField"/>
24+
<selectOption selector ="{{AdminConfigPaymentsAdvancedSection.testMode(countryCode)}}" userInput="No" stepKey="disableTestMode"/>
25+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.enabledSolution(countryCode)}}" stepKey="enabledSolutions"/>
26+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.enabledPaypalCredit(countryCode)}}" stepKey="disabledPaypalCredit"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminConfigForPaymentsAdvancedPaypalCreditActionGroup.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 © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminConfigForPaymentsAdvancedPaypalCreditActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="countryCode" type="string" defaultValue="us"/>
17+
</arguments>
18+
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
19+
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
20+
<waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
21+
<conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="expandOtherPaypalConfigButton"/>
22+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.otherPaypalLink(countryCode)}}" stepKey="assertPayinAllLink"/>
23+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.paypalPaymentGatewayLink(countryCode)}}" stepKey="assertPaypalPaymentGateway"/>
24+
<scrollTo selector="{{AdminConfigPaymentsAdvancedSection.otherPaypalLink(countryCode)}}" stepKey="scrollPayinAll"/>
25+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.paymentsAdvanced(countryCode)}}" stepKey="assertPaymentAdvanced"/>
26+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.paymentsPro(countryCode)}}" stepKey="assertPaymentsPro"/>
27+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.paymentsStandard(countryCode)}}" stepKey="assertPaymentStandard"/>
28+
<waitForElementClickable selector="{{AdminConfigPaymentsAdvancedSection.paymentsAdvanced(countryCode)}}" stepKey="waitToClickPaymentAdvanced"/>
29+
<click selector="{{AdminConfigPaymentsAdvancedSection.paymentsAdvanced(countryCode)}}" stepKey="clickPaymentAdvanced"/>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnablePaymentAdvancedConfigurationActionGroup">
12+
<annotations>
13+
<description>Configuration for Payments Advanced and Paypal credit Sample PayPal credentials</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="credentials" defaultValue="SamplePaypalPaymentsAdvancedConfig"/>
17+
<argument name="countryCode" type="string" defaultValue="us"/>
18+
</arguments>
19+
<scrollTo selector="{{AdminConfigPaymentsAdvancedSection.partner(countryCode)}}" stepKey="scrollToBottom"/>
20+
<waitForElementVisible selector="{{AdminConfigPaymentsAdvancedSection.partner(countryCode)}}" stepKey="waitForPartner"/>
21+
<fillField selector ="{{AdminConfigPaymentsAdvancedSection.partner(countryCode)}}" userInput="{{credentials.payflow_advanced_partner}}" stepKey="inputPartner"/>
22+
<waitForElementVisible selector="{{AdminConfigPaymentsAdvancedSection.vendor(countryCode)}}" stepKey="waitForVendor"/>
23+
<fillField selector ="{{AdminConfigPaymentsAdvancedSection.vendor(countryCode)}}" userInput="{{credentials.payflow_advanced_vendor}}" stepKey="inputVendor"/>
24+
<waitForElementVisible selector="{{AdminConfigPaymentsAdvancedSection.user(countryCode)}}" stepKey="waitForUser"/>
25+
<fillField selector ="{{AdminConfigPaymentsAdvancedSection.user(countryCode)}}" userInput="{{credentials.payflow_advanced_user}}" stepKey="inputUser"/>
26+
<waitForElementVisible selector="{{AdminConfigPaymentsAdvancedSection.password(countryCode)}}" stepKey="waitForPassword"/>
27+
<fillField selector ="{{AdminConfigPaymentsAdvancedSection.password(countryCode)}}" userInput="{{credentials.payflow_advanced_password}}" stepKey="inputPassword"/>
28+
<selectOption selector="{{AdminConfigPaymentsAdvancedSection.testMode(countryCode)}}" userInput="Yes" stepKey="enableTestMode"/>
29+
<wait time="10" stepKey="waitToEnableAdvanced"/>
30+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.solution(countryCode)}}" stepKey="activeEnableSolutions"/>
31+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.enabledPaypalCredit(countryCode)}}" stepKey="disablePaypalCredit"/>
32+
<waitForPageLoad stepKey="waitForPageLoadForEnableSolution"/>
33+
<selectOption selector ="{{AdminConfigPaymentsAdvancedSection.enableSolution(countryCode)}}" userInput="Yes" stepKey="enableSolution"/>
34+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.solution(countryCode)}}" stepKey="assertEnabledSolutions"/>
35+
<dontSeeElement selector ="{{AdminConfigPaymentsAdvancedSection.paypalCredit(countryCode)}}" stepKey="enablePaypalCredit"/>
36+
<seeElement selector ="{{AdminConfigPaymentsAdvancedSection.sortOrder(countryCode)}}" stepKey="assertSortOrderPaypalCredit"/>
37+
</actionGroup>
38+
</actionGroups>

‎app/code/Magento/Paypal/Test/Mftf/Data/PaypalData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,13 @@
277277
<data key="paypal_express_api_signature">AFcWxV21C7fd0v3bYYYRCpSSRl31AqoP3QLd.JUUpDPuPpQIgT0-m401</data>
278278
<data key="paypal_express_merchantID">54Z2EE6T7PRB4</data>
279279
</entity>
280+
<!-- configuration used for paypal PaymentsAdvanced-->
281+
<entity name="SamplePaypalPaymentsAdvancedConfig" type="payflow_advanced_config">
282+
<data key="payflow_advanced_partner">PayPal</data>
283+
<data key="payflow_advanced_user">mpilink</data>
284+
<data key="payflow_advanced_vendor">mpilink</data>
285+
<data key="payflow_advanced_password">1234_1234L!</data>
286+
</entity>
280287
<entity name="SamplePaypalPaymentsProConfig" type="paypal_paymentspro_config">
281288
<data key="paypal_paymentspro_parner">PayPal</data>
282289
<data key="paypal_paymentspro_user">MksGLTest</data>

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminConfigPaymentsAdvancedSection">
12+
<element name="paymentsAdvanced" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced-head" parameterized="true"/>
13+
<element name="paymentsPro" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wpp_usuk-head" parameterized="true"/>
14+
<element name="paymentsStandard" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_wps_express-head" parameterized="true"/>
15+
<element name="email" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_business_account" parameterized="true"/>
16+
<element name="partner" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner" parameterized="true"/>
17+
<element name="user" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user" parameterized="true"/>
18+
<element name="vendor" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor" parameterized="true"/>
19+
<element name="password" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_pwd" parameterized="true"/>
20+
<element name="testMode" type="select" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_sandbox_flag" parameterized="true" />
21+
<element name="otherPaypalLink" type="input" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_group_all_in_one-head')]" parameterized="true" />
22+
<element name="paypalPaymentGatewayLink" type="button" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_payment_gateways-head')]" parameterized="true" />
23+
<element name="enableSolution" type="select" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_payflow_advanced" parameterized="true"/>
24+
<element name="enablePaypalCredit" type="select" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_express_checkout_bml" parameterized="true"/>
25+
<element name="enabledSolution" type="select" selector="//select[contains(@id,'payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_payflow_advanced')]//label[@class='enabled']" parameterized="true"/>
26+
<element name="enabledPaypalCredit" type="select" selector="//select[contains(@id,'payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_express_checkout_bml')]//label[@class='enabled']" parameterized="true"/>
27+
<element name="solution" type="select" selector="//select[contains(@id,'payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_payflow_advanced')]//label[@class='disabled']" parameterized="true"/>
28+
<element name="paypalCredit" type="select" selector="//select[contains(@id,'payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_enable_express_checkout_bml')]//label[@class='disabled']" parameterized="true"/>
29+
<element name="payFlowEdition" type="button" selector="//span[contains(text(), 'PayPal Express Checkout Payflow Edition')]"/>
30+
<element name="payFlowExpress" type="button" selector="//span[contains(text(), 'PayPal Credit (Payflow Express Bml)')]"/>
31+
<element name="creditCardPayflowAdvanced" type="button" selector="//span[contains(text(), 'Credit Card (Payflow Advanced)')]"/>
32+
<element name="sortOrder" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_express_checkout_bml_sort_order" parameterized="true"/>
33+
</section>
34+
</sections>

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminConfigPaymentsAdvancedForPaypalCreditTest">
11+
<annotations>
12+
<features value="PayPal"/>
13+
<stories value="Payment methods"/>
14+
<title value="Check config for PayPal Credit in Unites States"/>
15+
<description value="Check paypal Credit payment option's enablement and disablement based on the configuration setting in backend"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-5151"/>
18+
</annotations>
19+
<before>
20+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
21+
<createData entity="SimpleSubCategory" stepKey="simpleCategory"/>
22+
<createData entity="SimpleProduct" stepKey="simpleProduct">
23+
<requiredEntity createDataKey="simpleCategory"/>
24+
</createData>
25+
<magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountry"/>
26+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
27+
</before>
28+
<after>
29+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
30+
<magentoCLI command="config:set paypal/general/merchant_country 0" stepKey="setMerchantCountryAsUS"/>
31+
<magentoCLI command="config:set payment/payflow_advanced/active 0" stepKey="disablePaymentsAdvanced"/>
32+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
33+
<deleteData createDataKey="simpleProduct" stepKey="deleteProduct"/>
34+
<deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
35+
</after>
36+
<!--Admin navigate to payment configuration page and assert no other paypal payment is enabled-->
37+
<actionGroup ref="AdminConfigForPaymentsAdvancedPaypalCreditActionGroup" stepKey="configPaymentsAdvanced"/>
38+
<!--Clear paypal credit config related data-->
39+
<actionGroup ref="AdminClearPaymentAdvancedDataActionGroup" stepKey="clearPaymentsAdvanced"/>
40+
<!--Enable Payment Advanced and Paypal Credit-->
41+
<actionGroup ref="AdminEnablePaymentAdvancedConfigurationActionGroup" stepKey="enablePaymentsAdvanced"/>
42+
<!--Save Configuration-->
43+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
44+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
45+
<argument name="indices" value=""/>
46+
</actionGroup>
47+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
48+
<argument name="tags" value="config full_page"/>
49+
</actionGroup>
50+
51+
<!--Login to storefront as guest customer-->
52+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStoreFront"/>
53+
<waitForPageLoad stepKey="waitForProductPage"/>
54+
<!--Add simple product-->
55+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
56+
<argument name="product" value="$simpleProduct$"/>
57+
</actionGroup>
58+
<!--Go to cart page-->
59+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="gotoCart"/>
60+
<!--Open cart page and proceed to checkout-->
61+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckoutCartPage"/>
62+
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="clickProceedToCheckout"/>
63+
<!--Fill Shipping Address-->
64+
<actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="fillShippingAddress">
65+
<argument name="customer" value="$$createCustomer$$" />
66+
<argument name="address" value="US_Address_TX"/>
67+
</actionGroup>
68+
<!-- Select shipping -->
69+
<actionGroup ref="StorefrontSetShippingMethodActionGroup" stepKey="selectShippingMethodAsFlatRate">
70+
<argument name="shippingMethodName" value="Flat Rate"/>
71+
</actionGroup>
72+
<!-- Go to Order review -->
73+
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="goToCheckoutPaymentPage"/>
74+
<waitForPageLoad stepKey="waitForLoadingMask"/>
75+
<!-- Assert Paypal Advanced and Paypal Credit Payment method -->
76+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.payFlowEdition}}" stepKey="assertPayflowEdition"/>
77+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.payFlowExpress}}" stepKey="assertPayflowExpress"/>
78+
<seeElement selector="{{AdminConfigPaymentsAdvancedSection.creditCardPayflowAdvanced}}" stepKey="assertCreditCardPayflowAdvanced"/>
79+
</test>
80+
</tests>

0 commit comments

Comments
 (0)