Skip to content

Commit e240c19

Browse files
subratpanditsubratpandit
committed
ACQE-6710:Check configuration for PayPal Payflow Link in Unites States
Correction On Testcases
1 parent 78b3d04 commit e240c19

5 files changed

+65
-15
lines changed

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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="AdminAssertPaypalPaymentMethodInConfigurationActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Validate Payment Solutions available in Other Paypal Payment Solution. Clicks on Payflow Link.</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+
<waitForElementVisible selector="{{AdminAssertPaymentSolutionInConfigurationSection.otherPaypalLink(countryCode)}}" stepKey="assertPayinAllLink"/>
23+
<waitForElementVisible selector="{{AdminAssertPaymentSolutionInConfigurationSection.paypalPaymentGatewayLink(countryCode)}}" stepKey="assertPaypalPaymentGateway"/>
24+
<!--Expand Paypal Payment Gateways-->
25+
<scrollTo selector="{{AdminAssertPaymentSolutionInConfigurationSection.paypalPaymentGatewayLink(countryCode)}}" stepKey="scrollPaymentGateway"/>
26+
<click selector="{{AdminAssertPaymentSolutionInConfigurationSection.paypalPaymentGatewayLink(countryCode)}}" stepKey="expandPaymentGatewayLink"/>
27+
<waitForElementVisible selector="{{AdminAssertPaymentSolutionInConfigurationSection.payflowLink(countryCode)}}" stepKey="assertPayflowLink"/>
28+
<waitForElementVisible selector="{{AdminAssertPaymentSolutionInConfigurationSection.payflowPro(countryCode)}}" stepKey="assertPayflowPro"/>
29+
<waitForElementClickable selector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" stepKey="waitForPayFlowConfigBtnToBeClickable"/>
30+
<click selector="{{AdminPayPalPayFlowLinkConfigSection.configureBtn(countryCode)}}" stepKey="clickOnPayflowConfigureBtn"/>
31+
</actionGroup>
32+
</actionGroups>

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@
1010
<annotations>
1111
<description>Enable Paypal Payflow Link through CLI Command with all Credentials in Configuration</description>
1212
</annotations>
13-
<arguments>
14-
<argument name="credentials" defaultValue="_CREDS"/>
15-
</arguments>
16-
<magentoCLI command="config:set {{PaypalPayflowEditionEmail.path}} {{credentials.magento/paypal_paymentsflowlink_businessacct}}" stepKey="enterInputForEmail"/>
17-
<magentoCLI command="config:set {{PaypalPayflowEditionPartner.path}} {{credentials.magento/paypal_paymentsflowlink_partner}}" stepKey="enterInputForPartner"/>
18-
<magentoCLI command="config:set {{PaypalPayflowEditionVendor.path}} {{credentials.magento/paypal_paymentsflowlink_vendor}}" stepKey="enterInputForVendor"/>
19-
<magentoCLI command="config:set {{PaypalPayflowEditionUser.path}} {{credentials.magento/paypal_paymentsflowlink_user}}" stepKey="enterInputForUser"/>
20-
<magentoCLI command="config:set {{PaypalPayflowEditionPassword.path}} {{credentials.magento/paypal_paymentsflowlink_password}}" stepKey="enterInputForPassword"/>
13+
<magentoCLI command="config:set {{PaypalPayflowEditionEmail.path}} {{PaypalPayflowEditionEmail.value}}" stepKey="enterInputForEmail"/>
14+
<magentoCLI command="config:set {{PaypalPayflowEditionPartner.path}} {{PaypalPayflowEditionPartner.value}}" stepKey="enterInputForPartner"/>
15+
<magentoCLI command="config:set {{PaypalPayflowEditionVendor.path}} {{PaypalPayflowEditionVendor.value}}" stepKey="enterInputForVendor"/>
16+
<magentoCLI command="config:set {{PaypalPayflowEditionUser.path}} {{PaypalPayflowEditionUser.value}}" stepKey="enterInputForUser"/>
17+
<magentoCLI command="config:set {{PaypalPayflowEditionPassword.path}} {{PaypalPayflowEditionPassword.value}}" stepKey="enterInputForPassword"/>
2118
<magentoCLI command="config:set {{SandboxFlag.path}} {{SandboxFlag.value}}" stepKey="enableSandboxMode"/>
2219
<magentoCLI command="config:set {{EnablePaypalPayflowEditionoMethod.path}} {{EnablePaypalPayflowEditionoMethod.value}}" stepKey="enablePayflowEdition"/>
2320
<magentoCLI command="config:set {{EnablePaypalExpressPayflow.path}} {{EnablePaypalExpressPayflow.value}}" stepKey="enablePaypalExpress"/>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,20 +267,25 @@
267267
<requiredEntity type="pwd">PaypalPayflowEditionPassword</requiredEntity>
268268
<requiredEntity type="sandbox_flag">SandboxFlag</requiredEntity>
269269
</entity>
270-
<entity name="PaypalPayflowEditionEmail" type="text">
270+
<entity name="PaypalPayflowEditionEmail" type="business_account">
271271
<data key="path">paypal/general/business_account</data>
272+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_businessacct}}</data>
272273
</entity>
273-
<entity name="PaypalPayflowEditionPartner" type="text">
274+
<entity name="PaypalPayflowEditionPartner" type="partner">
274275
<data key="path">payment/payflow_link/partner</data>
276+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_partner}}</data>
275277
</entity>
276-
<entity name="PaypalPayflowEditionUser" type="password">
278+
<entity name="PaypalPayflowEditionUser" type="user">
277279
<data key="path">payment/payflow_link/user</data>
280+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_user}}</data>
278281
</entity>
279-
<entity name="PaypalPayflowEditionVendor" type="text">
282+
<entity name="PaypalPayflowEditionVendor" type="vendor">
280283
<data key="path">payment/payflow_link/vendor</data>
284+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_vendor}}</data>
281285
</entity>
282-
<entity name="PaypalPayflowEditionPassword" type="password">
286+
<entity name="PaypalPayflowEditionPassword" type="pwd">
283287
<data key="path">payment/payflow_link/pwd</data>
288+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_password}}</data>
284289
</entity>
285290
<entity name="SandboxFlag" type="sandbox_flag">
286291
<data key="path">payment/payflow_link/sandbox_flag</data>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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="AdminAssertPaymentSolutionInConfigurationSection">
12+
<element name="payflowPro" type="button" selector="#payment_{{countryCode}}_paypal_payment_gateways_paypal_payflowpro_with_express_checkout-head" parameterized="true"/>
13+
<element name="payflowLink" type="button" selector="#payment_{{countryCode}}_paypal_payment_gateways_payflow_link_us-head" parameterized="true"/>
14+
<element name="otherPaypalLink" type="input" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_group_all_in_one-head')]" parameterized="true" />
15+
<element name="paypalPaymentGatewayLink" type="button" selector="//*[contains(@id, 'payment_{{countryCode}}_paypal_payment_gateways-head')]" parameterized="true" />
16+
</section>
17+
</sections>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
</createData>
2626
<magentoCLI command="config:set paypal/general/merchant_country US" stepKey="setMerchantCountry"/>
2727
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
28+
<actionGroup ref="AdminAssertPaypalPaymentMethodInConfigurationActionGroup" stepKey="assertPaymentSolutionsInPaypalLink"/>
2829
<actionGroup ref="AdminClearPayflowLinkExistingDataActionGroup" stepKey="clearValuesPresentInPayflowLink"/>
2930
</before>
3031
<after>
@@ -51,8 +52,6 @@
5152
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
5253
<argument name="product" value="$simpleProduct$"/>
5354
</actionGroup>
54-
<!--Go to cart page-->
55-
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="gotoCart"/>
5655
<!--Open cart page and proceed to checkout-->
5756
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckoutCartPage"/>
5857
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="clickProceedToCheckout"/>

0 commit comments

Comments
 (0)