Skip to content

Commit c6cd2da

Browse files
subratpanditsubratpandit
committed
ACQE-6742:Partial Capture for a sales order placed with PayPal Express Checkout (Payflow Edition)
Updated Steps in Testcases
1 parent e7dfd3d commit c6cd2da

6 files changed

+140
-34
lines changed

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminConfigPaymentAdvancedThroughCLIActionGroup">
11+
<annotations>
12+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save</description>
13+
</annotations>
14+
<magentoCLI command="config:set {{EnterPaypalPayAdvancedPartner.path}} {{EnterPaypalPayAdvancedPartner.value}}" stepKey="enterInputForPartner"/>
15+
<magentoCLI command="config:set {{EnterPaypalPayAdvancedVendor.path}} {{EnterPaypalPayAdvancedVendor.value}}" stepKey="enterInputForVendor"/>
16+
<magentoCLI command="config:set {{EnterPaypalPayAdvancedUser.path}} {{EnterPaypalPayAdvancedUser.value}}" stepKey="enterInputForUser"/>
17+
<magentoCLI command="config:set {{EnterPaymentAdvancedPassword.path}} {{EnterPaymentAdvancedPassword.value}}" stepKey="enterInputForPwd"/>
18+
<magentoCLI command="config:set {{EnablePaymentAdvancedSandbox.path}} {{EnablePaymentAdvancedSandbox.value}}" stepKey="enableSandboxMode"/>
19+
<magentoCLI command="config:set {{EnablePaymentAdvancedSolution.path}} {{EnablePaymentAdvancedSolution.value}}" stepKey="enablePaymentAdvancedSolution"/>
20+
<magentoCLI command="config:set {{EnablePaymentAdvancedPaypalCredit.path}} {{EnablePaymentAdvancedPaypalCredit.value}}" stepKey="enablePaypalCredit"/>
21+
<magentoCLI command="config:set payment/payflow_express/active 1" stepKey="enablePaypalExpress"/>
22+
</actionGroup>
23+
</actionGroups>

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

100644100755
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,19 @@
1212
<description>Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.</description>
1313
</annotations>
1414
<arguments>
15-
<argument name="credentials" defaultValue="SamplePaypalPaymentsAdvancedConfig"/>
15+
<argument name="credentials" defaultValue="_CREDS"/>
1616
<argument name="countryCode" type="string" defaultValue="us"/>
1717
</arguments>
1818
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
1919
<waitForPageLoad stepKey="waitForConfigPageLoad"/>
2020
<waitForElementVisible selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" stepKey="waitForOtherPayPalPaymentsSection"/>
2121
<conditionalClick selector="{{OtherPayPalPaymentsConfigSection.expandTab(countryCode)}}" dependentSelector="{{OtherPayPalPaymentsConfigSection.expandedTab(countryCode)}}" visible="false" stepKey="expandOtherPaypalConfigButton"/>
22-
<waitForElementClickable selector="{{AdminConfigurepaymentsAdvancedSection.configBtn(countryCode)}}" stepKey="waitForPayPalPaymentsAdvancedConfigureBtn"/>
23-
<click selector ="{{AdminConfigurepaymentsAdvancedSection.configBtn(countryCode)}}" stepKey="clickPayPalPaymentsAdvancedConfigureBtn"/>
24-
<scrollTo selector="{{AdminConfigurepaymentsAdvancedSection.partner(countryCode)}}" stepKey="scrollToBottom"/>
25-
<waitForElementVisible selector="{{AdminConfigurepaymentsAdvancedSection.partner(countryCode)}}" stepKey="waitForPartner"/>
26-
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.partner(countryCode)}}" userInput="{{credentials.payflow_advanced_partner}}" stepKey="inputPartner"/>
27-
<waitForElementVisible selector="{{AdminConfigurepaymentsAdvancedSection.vendor(countryCode)}}" stepKey="waitForVendor"/>
28-
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.vendor(countryCode)}}" userInput="{{credentials.payflow_advanced_vendor}}" stepKey="inputVendor"/>
22+
<waitForElementClickable selector="{{PayPalPaymentsProConfigSection.paymentsAdvanced(countryCode)}}" stepKey="waitForPayPalPaymentsAdvancedConfigureBtn"/>
23+
<click selector ="{{PayPalPaymentsProConfigSection.paymentsAdvanced(countryCode)}}" stepKey="clickPayPalPaymentsAdvancedConfigureBtn"/>
2924
<waitForElementVisible selector="{{AdminConfigurepaymentsAdvancedSection.user(countryCode)}}" stepKey="waitForUser"/>
30-
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.user(countryCode)}}" userInput="{{credentials.payflow_advanced_user}}" stepKey="inputUser"/>
25+
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.user(countryCode)}}" userInput="{{credentials.magento/paypal_paymentsflowlink_user}}" stepKey="inputUser"/>
3126
<waitForElementVisible selector="{{AdminConfigurepaymentsAdvancedSection.password(countryCode)}}" stepKey="waitForPassword"/>
32-
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.password(countryCode)}}" userInput="{{credentials.payflow_advanced_password}}" stepKey="inputPassword"/>
33-
<selectOption selector="{{AdminConfigurepaymentsAdvancedSection.testMode(countryCode)}}" userInput="Yes" stepKey="enableTestMode"/>
27+
<fillField selector ="{{AdminConfigurepaymentsAdvancedSection.password(countryCode)}}" userInput="{{credentials.magento/paypal_paymentsflowlink_password}}}" stepKey="inputPassword"/>
3428
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfiguration"/>
3529
</actionGroup>
3630
</actionGroups>

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

100644100755
Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,51 @@
127127
<entity name="Payer">
128128
<data key="firstName">Alex</data>
129129
</entity>
130-
130+
<entity name="PaypalPayflowAdvancedConfig" type="paypal_payflow_Advanced_config_state">
131+
<requiredEntity type="business_account">PaypalPayflowAdvancedBusinessAccount</requiredEntity>
132+
<requiredEntity type="partner">EnterPaypalPayAdvancedPartner</requiredEntity>
133+
<requiredEntity type="user">EnterPaypalPayAdvancedUser</requiredEntity>
134+
<requiredEntity type="vendor">EnterPaypalPayAdvancedVendor</requiredEntity>
135+
<requiredEntity type="pwd">EnterPaymentAdvancedPassword</requiredEntity>
136+
<requiredEntity type="sandbox_flag">EnablePaymentAdvancedSandbox</requiredEntity>
137+
<requiredEntity type="use_proxy">UseProxyAdvanced</requiredEntity>
138+
</entity>
139+
<entity name="EnterPaypalPayAdvancedPartner" type="text">
140+
<data key="path">payment/payflow_advanced/partner</data>
141+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_partner}}</data>
142+
</entity>
143+
<entity name="EnterPaypalPayAdvancedVendor" type="text">
144+
<data key="path">payment/payflow_advanced/vendor</data>
145+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_vendor}}</data>
146+
</entity>
147+
<entity name="EnterPaypalPayAdvancedUser" type="password">
148+
<data key="path">payment/payflow_advanced/user</data>
149+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_user}}</data>
150+
</entity>
151+
<entity name="EnterPaymentAdvancedPassword" type="password">
152+
<data key="path">payment/payflow_advanced/pwd</data>
153+
<data key="value">{{_CREDS.magento/paypal_paymentsflowlink_password}}</data>
154+
</entity>
155+
<entity name="EnablePaymentAdvancedSandbox">
156+
<data key="path">payment/payflow_advanced/sandbox_flag</data>
157+
<data key="value">1</data>
158+
</entity>
159+
<entity name="EnablePaymentAdvancedSolution">
160+
<data key="path">payment/payflow_advanced/active</data>
161+
<data key="value">1</data>
162+
</entity>
163+
<entity name="DisablePaymentAdvancedSolution">
164+
<data key="path">payment/payflow_advanced/active</data>
165+
<data key="value">0</data>
166+
</entity>
167+
<entity name="EnablePaymentAdvancedPaypalCredit">
168+
<data key="path">payment/payflow_express_bml/active</data>
169+
<data key="value">1</data>
170+
</entity>
171+
<entity name="DisablePaymentAdvancedPaypalCredit">
172+
<data key="path">payment/payflow_express_bml/active</data>
173+
<data key="value">0</data>
174+
</entity>
131175
<!-- configuration used for paypal payflow pro -->
132176
<entity name="EnablePaypalPayflowProWithVault" type="custom_paypal_payflow_pro_config_state">
133177
<requiredEntity type="enable_paypal_payflow">EnablePaypalPayflowProMethod</requiredEntity>

‎app/code/Magento/Paypal/Test/Mftf/Metadata/PaypalConfigMeta.xml

100644100755
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,51 @@
112112
</object>
113113
</object>
114114
</operation>
115+
<operation name="CreatePaypalPayflowAdvancedConfigState" dataType="paypal_payflow_Advanced_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/payment/" method="POST">
116+
<object key="groups" dataType="paypal_payflow_Advanced_config_state">
117+
<object key="other_paypal_payment_solutions" dataType="paypal_payflow_Advanced_config_state">
118+
<object key="groups" dataType="paypal_payflow_Advanced_config_state">
119+
<object key="paypal_group_all_in_one" dataType="paypal_payflow_Advanced_config_state">
120+
<object key="groups" dataType="paypal_payflow_Advanced_config_state">
121+
<object key="payflow_advanced" dataType="paypal_payflow_Advanced_config_state">
122+
<object key="groups" dataType="paypal_payflow_Advanced_config_state">
123+
<object key="payflow_advanced_required_settings" dataType="paypal_payflow_Advanced_config_state">
124+
<object key="groups" dataType="paypal_payflow_Advanced_config_state">
125+
<object key="payments_advanced" dataType="paypal_payflow_Advanced_config_state">
126+
<object key="fields" dataType="paypal_payflow_Advanced_config_state">
127+
<object key="business_account" dataType="business_account">
128+
<field key="value">string</field>
129+
</object>
130+
<object key="partner" dataType="partner">
131+
<field key="value">string</field>
132+
</object>
133+
<object key="user" dataType="user">
134+
<field key="value">string</field>
135+
</object>
136+
<object key="vendor" dataType="vendor">
137+
<field key="value">string</field>
138+
</object>
139+
<object key="pwd" dataType="pwd">
140+
<field key="value">string</field>
141+
</object>
142+
<object key="sandbox_flag" dataType="sandbox_flag">
143+
<field key="value">string</field>
144+
</object>
145+
<object key="use_proxy" dataType="use_proxy">
146+
<field key="value">string</field>
147+
</object>
148+
149+
</object>
150+
</object>
151+
</object>
152+
</object>
153+
</object>
154+
</object>
155+
</object>
156+
</object>
157+
</object>
158+
</object>
159+
</object>
160+
</operation>
115161
</operations>
162+

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

100644100755
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,8 @@
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="AdminConfigurepaymentsAdvancedSection">
11-
<element name="configBtn" type="button" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced-head" parameterized="true"/>
12-
<element name="email" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_business_account" parameterized="true"/>
13-
<element name="partner" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_partner" parameterized="true"/>
1411
<element name="user" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_user" parameterized="true"/>
15-
<element name="vendor" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_vendor" parameterized="true"/>
1612
<element name="password" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_pwd" parameterized="true"/>
17-
<element name="testMode" type="input" selector="#payment_{{countryCode}}_paypal_group_all_in_one_payflow_advanced_required_settings_payments_advanced_sandbox_flag" parameterized="true"/>
18-
<element name="payFlowExpress" type="radio" selector="//*[contains(text(), 'PayPal Credit (Payflow Express Bml)')]"/>
19-
<element name="continueButton" type="button" selector="/html/body/div[3]/main/div[2]/div/div/div[4]/ol/li[3]/div/form/fieldset/div[1]/div/div/div[4]/div[2]/div[4]/div/button/span" timeout="10"/>
13+
<element name="payflowEdition" type="radio" selector="//input[@id ='payflow_express']" timeout="10"/>
2014
</section>
2115
</sections>

‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCaptureInvoiceForPaypalBillingAgreementPaymentAdvancedTest.xml renamed to ‎app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPartialCaptureInvoiceForPaypalExpressPayflowEditionTest.xml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,32 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminCaptureInvoiceForPaypalBillingAgreementPaymentAdvancedTest">
10+
<test name="StorefrontPartialCaptureInvoiceForPaypalExpressPayflowEditionTest">
1111
<annotations>
1212
<features value="PayPal"/>
13-
<stories value="Partial Capture Order with Payments Advanced"/>
14-
<title value="Check Partial Capture order placed with Paypal Payments Advanced"/>
15-
<description value="Place an order with Paypal Payments Advanced as payment method and Partial Capture the Order"/>
13+
<stories value="Partial Capture Order with Payflow Edition"/>
14+
<title value="Partial Capture for a sales order placed with PayPal Express Checkout (Payflow Edition)"/>
15+
<description value="Place an order with Paypal express checkout payflow edition as payment method and Partial Capture the Order"/>
1616
<severity value="MAJOR"/>
17-
<testCaseId value="AC-4833"/>
17+
<testCaseId value="AC-4846"/>
1818
<group value="3rd_party_integration"/>
1919
</annotations>
2020
<before>
2121
<!-- Simple product is created -->
2222
<createData entity="SimpleProduct" stepKey="createProduct"/>
23+
<createData entity="SimpleProduct2" stepKey="createAnotherProduct"/>
2324
<!-- US Customer is created -->
2425
<createData entity="Simple_US_Customer_CA" stepKey="createCustomer"/>
2526
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
2627
<!-- Configure PayPal Express Checkout -->
27-
<actionGroup ref="AdminConfigurationPaymentAdvancedActionGroup" stepKey="ConfigPaymentAdvanced"/>
28+
<actionGroup ref="AdminConfigPaymentAdvancedThroughCLIActionGroup" stepKey="ConfigPaymentAdvanced"/>
29+
30+
<actionGroup ref="AdminConfigurationPaymentAdvancedActionGroup" stepKey="setValuesForUserAndPwd"/>
31+
2832
<magentoCLI command="config:set payment/payflow_advanced/active 1" stepKey="enablePaymentAdvancedSolution"/>
2933
<magentoCLI command="config:set payment/payflow_express_bml/active 1" stepKey="enablePaypalCredit"/>
30-
<magentoCLI command="config:set payment/payflow_express/active 1" stepKey="enablePayPalVault"/>
31-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexCronJob">
32-
<argument name="indices" value="cataloginventory_stock"/>
34+
<magentoCLI command="config:set payment/payflow_express/active 1" stepKey="enablePayPalVault"/><actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
35+
<argument name="indices" value=""/>
3336
</actionGroup>
3437
<!-- Login to StoreFront -->
3538
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
@@ -38,6 +41,7 @@
3841
<!-- Open Product Page to add product in the cart -->
3942
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="amOnProductPage">
4043
<argument name="product" value="$createProduct$"/>
44+
4145
</actionGroup>
4246
<scrollTo selector="{{StorefrontProductActionSection.quantity}}" stepKey="scrollToQuantityField"/>
4347
<actionGroup ref="AddProductWithQtyToCartFromStorefrontProductPageActionGroup" stepKey="addProductToCart">
@@ -49,10 +53,10 @@
4953
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
5054
<actionGroup ref="StorefrontCheckoutClickNextOnShippingStepActionGroup" stepKey="clickNext"/>
5155
<!-- Click on PayPal payment radio button -->
52-
<waitForElementClickable selector="{{AdminConfigurepaymentsAdvancedSection.payFlowExpress}}" stepKey="waitForPayPalRadioButton"/>
53-
<click selector="{{AdminConfigurepaymentsAdvancedSection.payFlowExpress}}" stepKey="selectPaypalPayment"/>
54-
<waitForElementClickable selector="{{AdminConfigurepaymentsAdvancedSection.continueButton}}" stepKey="waitForPayPalBtn"/>
55-
<click selector="{{AdminConfigurepaymentsAdvancedSection.continueButton}}" stepKey="clickPayPalBtn"/>
56+
<waitForElementClickable selector="{{AdminConfigurepaymentsAdvancedSection.payflowEdition}}" stepKey="waitForPayPalRadioButton"/>
57+
<click selector="{{AdminConfigurepaymentsAdvancedSection.payflowEdition}}" stepKey="selectPaypalPayment"/>
58+
<waitForElementClickable selector="{{CheckoutPaymentSection.ContinuePayPalBtn}}" stepKey="waitForPayPalBtn"/>
59+
<click selector="{{CheckoutPaymentSection.ContinuePayPalBtn}}" stepKey="clickPayPalBtn"/>
5660
<actionGroup ref="StorefrontLoginToPayPalExpressCheckoutPayFlowEditionActionGroup" stepKey="loginToPayPal"/>
5761
<actionGroup ref="StorefrontPaypalSwitchBackToMagentoFromCheckoutPageActionGroup" stepKey="confirmPaymentAndGoBackToMagento"/>
5862
<waitForText selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="waitForLoadSuccessPage"/>
@@ -61,8 +65,7 @@
6165
<after>
6266
<deleteData createDataKey="createProduct" stepKey="deleteSimpleProduct"/>
6367
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
64-
<magentoCLI command="config:set payment/payflow_express_bml/active 0" stepKey="disablePaypalCredit"/>
65-
<magentoCLI command="config:set payment/payflow_advanced/active 0" stepKey="disablePaymentAdvancedSolution"/>
68+
<magentoCLI command="config:set {{DisablePaymentAdvancedSolution.path}} {{DisablePaymentAdvancedSolution.value}}" stepKey="setEnablePayflowAdvancedToNo"/>
6669
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
6770
</after>
6871
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="orderNumber"/>
@@ -101,3 +104,4 @@
101104
</actionGroup>
102105
</test>
103106
</tests>
107+

0 commit comments

Comments
 (0)