Skip to content

Commit e6796f6

Browse files
glo05363glo05363
committed
ac344 mftf test case changes
1 parent 148a933 commit e6796f6

5 files changed

+73
-19
lines changed

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminPayPalExpressCheckoutDisableBillingAgreementActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Disable billing agreement option.</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="waitForPageLoad1"/>
20+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
21+
<click selector="{{PayPalExpressCheckoutConfigSection.advancePaypalSettings(countryCode)}}" stepKey="expandPaypalAdvancedSettings"/>
22+
<click selector="{{PayPalExpressCheckoutConfigSection.paypalBillingAgreement(countryCode)}}" stepKey="expandBillingAgreementSettings"/>
23+
<selectOption selector="{{PayPalExpressCheckoutConfigSection.billingDisable(countryCode)}}" userInput="No" stepKey="disableBillingAgreement"/>
24+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig3"/>
25+
<waitForPageLoad stepKey="waitForPageLoad2"/>
26+
</actionGroup>
27+
</actionGroups>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="AdminPayPalExpressCheckoutEnableBillingAgreementActionGroup">
12+
<annotations>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Enable billing agreement option.</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="waitForPageLoad1"/>
20+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
21+
<click selector="{{PayPalExpressCheckoutConfigSection.advancePaypalSettings(countryCode)}}" stepKey="expandPaypalAdvancedSettings"/>
22+
<click selector="{{PayPalExpressCheckoutConfigSection.paypalBillingAgreement(countryCode)}}" stepKey="expandBillingAgreementSettings"/>
23+
<selectOption selector="{{PayPalExpressCheckoutConfigSection.billingDisable(countryCode)}}" userInput="Yes" stepKey="disableBillingAgreement"/>
24+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
25+
<waitForPageLoad stepKey="waitForPageLoad2"/>
26+
</actionGroup>
27+
</actionGroups>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminPayPalExpressCheckoutPayLaterDisableActionGroup">
1212
<annotations>
13-
<description>Goes to the 'Configuration' page for 'Payment Methods'. Disable Paylater option.</description>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Disable Pay later option.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="countryCode" type="string" defaultValue="us"/>
1717
</arguments>
18-
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentPayLaterConfigurationPage"/>
19-
<waitForPageLoad stepKey="waitForPageLoadOnPayLater"/>
20-
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtnForPayLater"/>
21-
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePaylater(countryCode)}}" userInput="No" stepKey="disablePaylater"/>
22-
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
18+
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
2319
<waitForPageLoad stepKey="waitForPageLoad1"/>
20+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
21+
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePayLater(countryCode)}}" userInput="No" stepKey="disablePayLater"/>
22+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig5"/>
23+
<waitForPageLoad stepKey="waitForPageLoad2"/>
2424
</actionGroup>
2525
</actionGroups>

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,21 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminPayPalExpressCheckoutPayLaterEnableActionGroup">
1212
<annotations>
13-
<description>Goes to the 'Configuration' page for 'Payment Methods'. Enable Paylater option.</description>
13+
<description>Goes to the 'Configuration' page for 'Payment Methods'. Enable pay later option.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="countryCode" type="string" defaultValue="us"/>
1717
</arguments>
18-
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentPayLaterConfigurationPage"/>
19-
<waitForPageLoad stepKey="waitForPageLoadOnPayLater"/>
20-
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtnForPayLater"/>
21-
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePaylater(countryCode)}}" userInput="Yes" stepKey="enablePaylater"/>
22-
<waitForPageLoad stepKey="waitForPageLoadOnPayLater2"/>
18+
<amOnPage url="{{AdminConfigPaymentMethodsPage.url}}" stepKey="navigateToPaymentConfigurationPage"/>
19+
<waitForPageLoad stepKey="waitForPageLoad1"/>
20+
<click selector="{{PayPalExpressCheckoutConfigSection.configureBtn(countryCode)}}" stepKey="clickPayPalConfigureBtn"/>
21+
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePayLater(countryCode)}}" userInput="Yes" stepKey="enablePayLater"/>
2322
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterConfigDropDown(countryCode)}}" stepKey="clickPayLaterConfiguration" />
24-
<waitForPageLoad stepKey="waitForPageLoadOnPayLater3"/>
25-
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePaylaterIn(countryCode)}}" userInput="Yes" stepKey="enablePaylaterIn"/>
23+
<selectOption selector="{{PayPalExpressCheckoutConfigSection.enablePayLaterIn(countryCode)}}" userInput="Yes" stepKey="enablePayLaterIn"/>
2624
<click selector="{{PayPalExpressCheckoutConfigSection.payLaterCatalogPageConfigDropDown(countryCode)}}" stepKey="clickCatalogPageConfig" />
27-
<waitForPageLoad stepKey="waitForPageLoadOnPayLater4"/>
2825
<selectOption selector="{{PayPalExpressCheckoutConfigSection.display(countryCode)}}" userInput="Yes" stepKey="enableDisplay"/>
2926
<selectOption selector="{{PayPalExpressCheckoutConfigSection.position(countryCode)}}" userInput="near_pp_button" stepKey="enablePayLaterButton"/>
30-
<click selector="{{AdminConfigSection.saveButton}}" stepKey="savePayLaterConfig"/>
31-
<waitForPageLoad stepKey="waitForPageLoad5"/>
27+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
28+
<waitForPageLoad stepKey="waitForPageLoad2"/>
3229
</actionGroup>
3330
</actionGroups>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
<element name="enableSolution" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_express_checkout" parameterized="true"/>
1919
<element name="enableInContext" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_in_context_checkout" parameterized="true"/>
2020
<element name="merchantID" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_merchant_id" parameterized="true"/>
21-
<element name="enablePaylater" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_paypal_paylater_experience" parameterized="true"/>
21+
<element name="enablePayLater" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_enable_paypal_paylater_experience" parameterized="true"/>
2222
<element name="payLaterConfigDropDown" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater-head" parameterized="true"/>
23-
<element name="enablePaylaterIn" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_paylater_enabled" parameterized="true" />
23+
<element name="enablePayLaterIn" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_paylater_enabled" parameterized="true" />
2424
<element name="payLaterCatalogPageConfigDropDown" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage-head" parameterized="true" />
2525
<element name="display" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_display" parameterized="true"/>
2626
<element name="position" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_express_checkout_required_advertise_paylater_settings_paylater_productpage_paylater_productpage_position" parameterized="true"/>
27+
<element name="advancePaypalSettings" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced-head" parameterized="true" />
28+
<element name="paypalBillingAgreement" type="button" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_billing_agreement-head" parameterized="true" />
29+
<element name="billingDisable" type="input" selector="#payment_{{countryCode}}_paypal_alternative_payment_methods_express_checkout_{{countryCode}}_settings_ec_settings_ec_advanced_express_checkout_billing_agreement_active" parameterized="true" />
2730
</section>
2831
</sections>

0 commit comments

Comments
 (0)