Skip to content

Commit 313c1af

Browse files
manjusha729manjusha729
committed
Merge branch 'ACQE-6361' into ACQE-7021-functional-tests-mainline-deployment
2 parents 81d58fe + a9455d2 commit 313c1af

File tree

7 files changed

+44
-52
lines changed

7 files changed

+44
-52
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartMessageSection.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<element name="emptyCartMessage" type="text" selector=".cart-empty>p"/>
1515
<element name="errorMessageText" type="text" selector="//div[contains(@class, 'message-error')]/div[text()='{{var}}']" parameterized="true"/>
1616
<element name="backorderErrorMessage" type="text" selector=".//*[@class='cart item']//div[@class='cart item message notice']"/>
17-
<element name="invalidAddressError" type="text" selector="//div[contains(text(),'PayPal gateway has rejected request. A match of the Shipping Address City, State, and Postal Code failed (#10736: Shipping Address Invalid City State Postal Code)')]"/>
17+
<element name="invalidAddressError" type="text" selector="//div[contains(text(),'{{errorMessageText}}')]" parameterized="true"/>
1818
</section>
1919
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@
4242
<element name="fptAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='totals']//td[@class='amount']/span"/>
4343
<element name="canadaTaxAmount" type="text" selector="//span[@data-th='Canada-GST-5%']"/>
4444
<element name="canadaPstTaxAmount" type="text" selector="//span[@data-th='Canada-GST-PST-5%']"/>
45-
<element name="PayPalBtnLessTimeout" type="button" selector=".paypal-button.paypal-button-number-0"/>
4645
</section>
4746
</sections>

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,32 @@
3434
<data key="default_billing">true</data>
3535
<data key="region_qty">66</data>
3636
</entity>
37+
<entity name="CustomerInvalidAddress" type="address">
38+
<data key="id">0</data>
39+
<data key="customer_id">12</data>
40+
<requiredEntity type="region">CustomerRegionOne</requiredEntity>
41+
<data key="region_id">0</data>
42+
<data key="country_id">US</data>
43+
<array key="street">
44+
<item>7700 W Parmer Ln</item>
45+
<item>Bld D</item>
46+
</array>
47+
<data key="company">Magento</data>
48+
<data key="telephone">Invalid Telephone</data>
49+
<data key="fax">1234568910</data>
50+
<data key="postcode">Invalid PostCode</data>
51+
<data key="city">InvalidCity</data>
52+
<data key="state">Texas</data>
53+
<data key="firstname">John</data>
54+
<data key="lastname">Doe</data>
55+
<data key="middlename">string</data>
56+
<data key="prefix">Mr</data>
57+
<data key="suffix">Sr</data>
58+
<data key="vat_id">vatData</data>
59+
<data key="default_shipping">true</data>
60+
<data key="default_billing">true</data>
61+
<data key="region_qty">66</data>
62+
</entity>
3763
<entity name="US_Address_TX" type="address">
3864
<data key="firstname">John</data>
3965
<data key="lastname">Doe</data>

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8+
89
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
910
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1011
<actionGroup name="SwitchToPayPalGroupBtnActionGroup">
@@ -13,13 +14,12 @@
1314
</annotations>
1415
<arguments>
1516
<argument name="elementNumber" type="string" defaultValue="0"/>
16-
<argument name="frameName" type="string" defaultValue="myFrame"/>
1717
</arguments>
1818
<!--set ID for iframe of PayPal group button-->
19-
<executeJS function="document.getElementsByClassName('component-frame')[{{elementNumber}}].setAttribute('name', '{{frameName}}');" stepKey="setIDForIframe"/>
19+
<executeJS function="document.getElementsByClassName('component-frame')[{{elementNumber}}].setAttribute('name', 'myFrame');" stepKey="setIDForIframe"/>
2020
<!--switch to iframe of PayPal group button-->
2121
<switchToIFrame userInput="myFrame" stepKey="switchToIframe"/>
22-
<waitForElementClickable selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
22+
<waitForElementVisible selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="waitForPayPalBtn"/>
2323
<click selector="{{CheckoutPaymentSection.PayPalBtn}}" stepKey="clickPayPalBtn"/>
2424
<switchToIFrame stepKey="switchBackToMainFrame"/>
2525
</actionGroup>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<element name="payPalFrame" type="iframe" selector="//iframe[contains(@class, 'zoid-component-frame zoid-visible')]" timeout="5"/>
1414
<element name="smartButtonPayPalFrame" type="iframe" selector=".component-frame" timeout="10"/>
1515
<element name="PayPalPaymentRadio" type="radio" selector="input#paypal_express.radio" timeout="30"/>
16-
<element name="PayPalBtn" type="button" selector="div.paypal-button.paypal-button-number-0" />
16+
<element name="PayPalBtn" type="radio" selector=".paypal-button.paypal-button-number-0" timeout="30"/>
1717
<element name="ContinuePayPalBtn" type="radio" selector="//span[text()='Continue to PayPal']"/>
1818
<element name="PayPalExpressCheckoutPayFlowEdition" type="radio" selector="input#payflow_express.radio"/>
1919
<element name="continueButton" type="button" selector="//div[@class='payment-method _active']//button[@class='action primary checkout']/span[text()='Continue to PayPal']"/>
@@ -27,6 +27,5 @@
2727
<element name="cvv" type="input" selector="//input[@id='cvv2_number']" timeout="10"/>
2828
<element name="payNowBtn" type="button" selector="//input[@id='btn_pay_cc']" timeout="10"/>
2929
<element name="invalidAddressError" type="text" selector="div.message.message-error.error" timeout="5"/>
30-
<element name="PayPalBtnLessTimeout" type="button" selector=".paypal-button.paypal-button-number-0" timeout="3"/>
3130
</section>
3231
</sections>

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="AC-3995"/>
1919
<group value="paypalExpress"/>
20-
<!--<group value="pr_exclude"/>-->
20+
<group value="pr_exclude"/>
2121
</annotations>
2222
<before>
2323
<!--Login as Admin-->
@@ -53,11 +53,10 @@
5353
<fillField selector="{{CheckoutShippingSection.street}}" userInput="johndoe@example.com" stepKey="SetInvalidStreetAddress"/>
5454
<waitForElementVisible selector="{{CheckoutShippingSection.country}}" stepKey="waitToSelectCountry"/>
5555
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="United States" stepKey="selectCountryInStorefrontAddressBook"/>
56-
<waitForElementVisible selector="{{CheckoutShippingSection.region}}" stepKey="waitToSelectState"/>
57-
<selectOption selector="{{CheckoutShippingSection.region}}" userInput="California" stepKey="selectStateInStorefrontAddressBook"/>
58-
<fillField selector="{{CheckoutShippingSection.city}}" userInput="johndoe@example.com" stepKey="SetInvalidCity"/>
59-
<fillField selector="{{CheckoutShippingSection.postcode}}" userInput="johndoe@example.com" stepKey="SetInvalidZipCode"/>
60-
<fillField selector="{{CheckoutShippingSection.telephone}}" userInput="johndoe@example.com" stepKey="SetInvalidPhoneNumber"/>
56+
<actionGroup ref="GuestCheckoutFillNewShippingAddressActionGroup" stepKey="guestCheckoutFillingShippingSection">
57+
<argument name="customer" value="CustomerEntityOne" />
58+
<argument name="address" value="CustomerInvalidAddress" />
59+
</actionGroup>
6160
<!--Select Flat Rate shipping method-->
6261
<waitForElementClickable selector="{{CheckoutShippingMethodsSection.shippingMethodFlatRate}}" stepKey="waitForFlatRateShippingMethod"/>
6362
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShippingMethod"/>
@@ -67,32 +66,30 @@
6766
<waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" stepKey="waitForPayPalExpressButton"/>
6867
<click selector="{{CheckoutPaymentSection.PayPalPaymentRadio}}" stepKey="clickPayPalExpressButton"/>
6968
<!--Switch to paypal group and click on paypal button-->
70-
<actionGroup ref="StorefrontSwitchPayPalGroupBtnWithLessTimeoutActionGroup" stepKey="clickPayPalButtonFromCheckoutPage"/>
69+
<actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalButtonFromCheckoutPage"/>
7170
<!--Assert invalid address error from checkout page-->
7271
<actionGroup ref="StorefrontAssertInvalidAddressErrorActionGroup" stepKey="assertInvalidAddressErrorFromCheckoutPage">
7372
<argument name="invalidAddressError" value="{{CheckoutPaymentSection.invalidAddressError}}"/>
7473
</actionGroup>
7574
<!--Navigate to shopping cart-->
7675
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPageForAssertion"/>
7776
<!-- Click on Paypal paypal button on cart page-->
78-
<actionGroup ref="StorefrontSwitchPayPalGroupBtnWithLessTimeoutActionGroup" stepKey="clickPayPalBtnFromCartPage">
77+
<actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtnFromCartPage">
7978
<argument name="elementNumber" value="1"/>
8079
</actionGroup>
8180
<!--Assert invalid address error from cart page-->
8281
<actionGroup ref="StorefrontAssertInvalidAddressErrorActionGroup" stepKey="assertErrorMessageFromCartPage">
83-
<argument name="invalidAddressError" value="{{CheckoutCartMessageSection.invalidAddressError}}"/>
82+
<argument name="invalidAddressError" value="{{CheckoutCartMessageSection.invalidAddressError('PayPal gateway has rejected request. A match of the Shipping Address City, State, and Postal Code failed (#10736: Shipping Address Invalid City State Postal Code)')}}"/>
8483
</actionGroup>
85-
<!-- Open Mini Cart -->
86-
<actionGroup ref="StorefrontOpenMiniCartActionGroup" stepKey="openMiniCart"/>
87-
<!-- Click on Paypal paypal button on mini cart page-->
88-
<actionGroup ref="StorefrontSwitchPayPalGroupBtnWithLessTimeoutActionGroup" stepKey="clickPayPalBtnFromMiniCart">
84+
<click selector="{{StorefrontMinicartSection.showCart}}" stepKey="clickCart"/>
85+
<actionGroup ref="ClickViewAndEditCartFromMiniCartActionGroup" stepKey="openShoppingCart"/>
86+
<!--Click Paypal button-->
87+
<actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn">
8988
<argument name="elementNumber" value="1"/>
9089
</actionGroup>
91-
<!--Close Mini Cart-->
92-
<click selector="{{StorefrontMinicartSection.minicartclose}}" stepKey="closeMiniCart"/>
9390
<!--Assert invalid address error from mini cart page-->
9491
<actionGroup ref="StorefrontAssertInvalidAddressErrorActionGroup" stepKey="assertErrorMessageFromMiniCartPage">
95-
<argument name="invalidAddressError" value="{{CheckoutCartMessageSection.invalidAddressError}}"/>
92+
<argument name="invalidAddressError" value="{{CheckoutCartMessageSection.invalidAddressError('PayPal gateway has rejected request. A match of the Shipping Address City, State, and Postal Code failed (#10736: Shipping Address Invalid City State Postal Code)')}}"/>
9693
</actionGroup>
9794
</test>
9895
</tests>

0 commit comments

Comments
 (0)