Skip to content

Commit 6e66e2a

Browse files
soumyausoumyau
committed
MQE-1686: Paypal integration test leveraging Adobe Vault - PayPalSmartButtonInCheckoutPage
fixed as per review comments
1 parent 380e14f commit 6e66e2a

8 files changed

+90
-35
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyCheckoutSuccessActionGroup.xml renamed to ‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontCheckoutSuccessActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="VerifyCheckoutSuccessActionGroup">
11+
<actionGroup name="AssertStorefrontCheckoutSuccessActionGroup">
1212
<annotations>
1313
<description>Verifies if the order is placed successfully on the 'one page checkout' page.</description>
1414
</annotations>

‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/PayOrderOnPayPalCheckoutActionGroup.xml renamed to ‎app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontPayOrderOnPayPalCheckoutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="PayOrderOnPayPalCheckoutActionGroup">
11+
<actionGroup name="StorefrontPayOrderOnPayPalCheckoutActionGroup">
1212
<annotations>
1313
<description>Verifies product name on Paypal cart and clicks 'Pay Now' on PayPal payment checkout page.</description>
1414
</annotations>

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="StorefrontPaypalEnableConfigData">
12+
<data key="path">payment/paypal_express/active</data>
13+
<data key="scope_id">1</data>
14+
<data key="label">Yes</data>
15+
<data key="value">1</data>
16+
</entity>
17+
<entity name="StorefrontPaypalDisableConfigData">
18+
<data key="path">payment/paypal_express/active</data>
19+
<data key="scope_id">1</data>
20+
<data key="label">No</data>
21+
<data key="value">0</data>
22+
</entity>
23+
<entity name="StorefrontPaypalMerchantAccountIdConfigData">
24+
<data key="path">payment/paypal_express/merchant_id</data>
25+
<data key="scope_id">1</data>
26+
<data key="value">''</data>
27+
</entity>
28+
<entity name="StorefrontPaypalEnableSkipOrderReviewStepConfigData">
29+
<data key="path">payment/paypal_express/skip_order_review_step</data>
30+
<data key="scope_id">1</data>
31+
<data key="label">Yes</data>
32+
<data key="value">1</data>
33+
</entity>
34+
<entity name="StorefrontPaypalDisableSkipOrderReviewStepConfigData">
35+
<data key="path">payment/paypal_express/skip_order_review_step</data>
36+
<data key="scope_id">1</data>
37+
<data key="label">No</data>
38+
<data key="value">0</data>
39+
</entity>
40+
<entity name="StorefrontPaypalEnableInContextCheckoutConfigData">
41+
<data key="path">payment/paypal_express/in_context</data>
42+
<data key="scope_id">1</data>
43+
<data key="label">Yes</data>
44+
<data key="value">1</data>
45+
</entity>
46+
<entity name="StorefrontPaypalDisableInContextCheckoutConfigData">
47+
<data key="path">payment/paypal_express/active</data>
48+
<data key="scope_id">1</data>
49+
<data key="label">No</data>
50+
<data key="value">0</data>
51+
</entity>
52+
</entities>

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,24 +109,27 @@
109109
<requiredEntity type="use_proxy">UseProxy</requiredEntity>
110110
</entity>
111111
<entity name="BusinessAccount" type="business_account">
112-
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_business_account}}</data>
112+
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_business_account}}</data>
113113
</entity>
114114
<entity name="ApiUsername" type="api_username">
115-
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_username}}</data>
115+
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_username}}</data>
116116
</entity>
117117
<entity name="ApiPassword" type="api_password">
118-
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_password}}</data>
118+
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_password}}</data>
119119
</entity>
120120
<entity name="ApiSignature" type="api_signature">
121-
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_signature}}</data>
121+
<data key="value">{{_CREDS.magento/paypal_express_checkout_us_api_signature}}</data>
122122
</entity>
123123
<entity name="ApiAuthentication" type="api_authentication">
124-
<data key="value">0</data>
124+
<data key="value">0</data>
125125
</entity>
126126
<entity name="SandboxFlag" type="sandbox_flag">
127-
<data key="value">1</data>
127+
<data key="value">1</data>
128128
</entity>
129129
<entity name="UseProxy" type="use_proxy">
130-
<data key="value">0</data>
130+
<data key="value">0</data>
131+
</entity>
132+
<entity name="Payer">
133+
<data key="firstName">Alex</data>
131134
</entity>
132135
</entities>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
99
<suite name="PaypalTestSuite">
1010
<include>
11-
<test name="CheckDefaultValueOfPayPalCustomizeButtonTest"/>
12-
<test name="PayPalSmartButtonInCheckoutPage"/>
13-
<test name="CheckCreditButtonConfiguration"/>
11+
<test name="AdminCheckDefaultValueOfPayPalCustomizeButtonTest"/>
12+
<test name="StorefrontPayPalSmartButtonInCheckoutPageTest"/>
13+
<test name="StorefrontCheckCreditButtonConfigurationTest"/>
1414
</include>
1515
</suite>
1616
</suites>

‎app/code/Magento/Paypal/Test/Mftf/Test/CheckDefaultValueOfPayPalCustomizeButtonTest.xml renamed to ‎app/code/Magento/Paypal/Test/Mftf/Test/AdminCheckDefaultValueOfPayPalCustomizeButtonTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="CheckDefaultValueOfPayPalCustomizeButtonTest">
11+
<test name="AdminCheckDefaultValueOfPayPalCustomizeButtonTest">
1212
<annotations>
13-
<features value="PayPal"/>
13+
<features value="Paypal"/>
1414
<stories value="Button Configuration"/>
15-
<title value="Check Default Value Of PayPal Customize Button"/>
16-
<description value="Default value of PayPal Customize Button should be NO"/>
15+
<title value="Check Default Value Of Paypal Customize Button"/>
16+
<description value="Default value of Paypal Customize Button should be NO"/>
1717
<severity value="AVERAGE"/>
1818
<testCaseId value="MC-10904"/>
1919
<skip>

‎app/code/Magento/Paypal/Test/Mftf/Test/CheckCreditButtonConfiguration.xml renamed to ‎app/code/Magento/Paypal/Test/Mftf/Test/StorefrontCheckCreditButtonConfigurationTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="CheckCreditButtonConfiguration">
11+
<test name="StorefrontCheckCreditButtonConfigurationTest">
1212
<annotations>
13-
<features value="PayPal"/>
13+
<features value="Paypal"/>
1414
<stories value="Button Configuration"/>
1515
<title value="Check Credit Button Configuration"/>
1616
<description value="Admin is able to customize Credit button"/>
@@ -48,8 +48,8 @@
4848
<!--Verify Credit Button value-->
4949
<comment userInput="Verify Credit Button value" stepKey="commentVerifyDefaultValue2"/>
5050
<selectOption selector="{{ButtonCustomization.label}}" userInput="{{PayPalLabel.credit}}" stepKey="selectCreditAsLabel"/>
51-
<seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize2"/>
52-
<seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape2"/>
51+
<seeElement selector="{{ButtonCustomization.size}}" stepKey="seeSize"/>
52+
<seeElement selector="{{ButtonCustomization.shape}}" stepKey="seeShape"/>
5353
<dontSeeElement selector="{{ButtonCustomization.layout}}" stepKey="dontSeeLayout"/>
5454
<dontSeeElement selector="{{ButtonCustomization.color}}" stepKey="dontSeeColor"/>
5555
<!--Customize Credit Button-->

‎app/code/Magento/Paypal/Test/Mftf/Test/PayPalSmartButtonInCheckoutPage.xml renamed to ‎app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="PayPalSmartButtonInCheckoutPage">
11+
<test name="StorefrontPaypalSmartButtonInCheckoutPageTest">
1212
<annotations>
13-
<features value="PayPal"/>
13+
<features value="Paypal"/>
1414
<stories value="Generic checkout skeleton flow"/>
15-
<title value="Mainflow of PayPal Smart Button"/>
16-
<description value="Users are able to place order using PayPal Smart Button"/>
15+
<title value="Mainflow of Paypal Smart Button"/>
16+
<description value="Users are able to place order using Paypal Smart Button"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-13690"/>
1919
<skip>
@@ -32,21 +32,21 @@
3232
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
3333

3434
<!-- Set Paypal express config -->
35-
<magentoCLI command="config:set payment/paypal_express/active 1" stepKey="enablePaypal"/>
36-
<magentoCLI command="config:set payment/paypal_express/in_context 1" stepKey="enableInContextPayPal"/>
37-
<magentoCLI command="config:set payment/paypal_express/skip_order_review_step 1" stepKey="enableSkipOrderReview"/>
38-
<magentoCLI command="config:set payment/paypal_express/merchant_id {{_CREDS.magento/paypal_express_checkout_us_merchant_id}}" stepKey="setMerchantId"/>
35+
<magentoCLI command="config:set {{StorefrontPaypalEnableConfigData.path}} {{StorefrontPaypalEnableConfigData.value}}" stepKey="enablePaypal"/>
36+
<magentoCLI command="config:set {{StorefrontPaypalEnableInContextCheckoutConfigData.path}} {{StorefrontPaypalEnableInContextCheckoutConfigData.value}}" stepKey="enableInContextPayPal"/>
37+
<magentoCLI command="config:set {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalEnableSkipOrderReviewStepConfigData.value}}" stepKey="enableSkipOrderReview"/>
38+
<magentoCLI command="config:set {{StorefrontPaypalMerchantAccountIdConfigData.path}} {{_CREDS.magento/paypal_express_checkout_us_merchant_id}}" stepKey="setMerchantId"/>
3939
<createData entity="PaypalConfig" stepKey="createPaypalExpressConfig"/>
4040

4141
<!-- Login -->
4242
<actionGroup ref="LoginActionGroup" stepKey="login"/>
4343
</before>
4444
<after>
4545
<!-- Cleanup Paypal configurations -->
46-
<magentoCLI command="config:set payment/paypal_express/merchant_id ''" stepKey="deleteMerchantId"/>
47-
<magentoCLI command="config:set payment/paypal_express/skip_order_review_step 0" stepKey="disableSkipOrderReview"/>
48-
<magentoCLI command="config:set payment/paypal_express/in_context 0" stepKey="disableInContextPayPal"/>
49-
<magentoCLI command="config:set payment/paypal_express/active 0" stepKey="disablePaypal"/>
46+
<magentoCLI command="config:set {{StorefrontPaypalMerchantAccountIdConfigData.path}} {{StorefrontPaypalMerchantAccountIdConfigData.value}}" stepKey="deleteMerchantId"/>
47+
<magentoCLI command="config:set {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.path}} {{StorefrontPaypalDisableSkipOrderReviewStepConfigData.value}}" stepKey="disableSkipOrderReview"/>
48+
<magentoCLI command="config:set {{StorefrontPaypalDisableInContextCheckoutConfigData.path}} {{StorefrontPaypalDisableInContextCheckoutConfigData.value}}" stepKey="disableInContextPayPal"/>
49+
<magentoCLI command="config:set {{StorefrontPaypalDisableConfigData.path}} {{StorefrontPaypalDisableConfigData.value}}" stepKey="disablePaypal"/>
5050
<createData entity="SamplePaypalConfig" stepKey="setDefaultPaypalConfig"/>
5151

5252
<!-- Delete product -->
@@ -68,15 +68,15 @@
6868
<!-- Place an order using PayPal payment method -->
6969
<actionGroup ref="CreatePayPalOrderWithSelectedPaymentMethodActionGroup" stepKey="createPayPalOrder">
7070
<argument name="Category" value="$$createCategory$$"/>
71-
<argument name="payerName" value="Alex"/>
71+
<argument name="payerName" value="{{Payer.firstName}}"/>
7272
</actionGroup>
7373

7474
<!-- PayPal checkout -->
75-
<actionGroup ref="PayOrderOnPayPalCheckoutActionGroup" stepKey="payOrderOnPayPalCheckout">
75+
<actionGroup ref="StorefrontPayOrderOnPayPalCheckoutActionGroup" stepKey="payOrderOnPayPalCheckout">
7676
<argument name="productName" value="$$createProduct.name$$"/>
7777
</actionGroup>
7878

7979
<!-- I see order successful Page instead of Order Review Page -->
80-
<actionGroup ref="VerifyCheckoutSuccessActionGroup" stepKey="verifyCheckoutSuccess"/>
80+
<actionGroup ref="AssertStorefrontCheckoutSuccessActionGroup" stepKey="assertCheckoutSuccess"/>
8181
</test>
8282
</tests>

0 commit comments

Comments
 (0)