Skip to content

Commit 180b071

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-5448' into ACQE-6651_mainline_PR_deployment
2 parents a16bbde + df40910 commit 180b071

File tree

6 files changed

+236
-1
lines changed

6 files changed

+236
-1
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,4 +528,18 @@
528528
<data key="default_shipping">Yes</data>
529529
<requiredEntity type="region">RegionCA</requiredEntity>
530530
</entity>
531+
<entity name="US_Address_Florida">
532+
<data key="firstname">John</data>
533+
<data key="lastname">Doe</data>
534+
<data key="company">Magento</data>
535+
<array key="street">
536+
<item>352 Lake View Lane</item>
537+
</array>
538+
<data key="city">Palm Bay</data>
539+
<data key="country_id">United States</data>
540+
<data key="country">United States</data>
541+
<data key="state">Florida</data>
542+
<data key="postcode">32909</data>
543+
<data key="telephone">12345678</data>
544+
</entity>
531545
</entities>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminDisableUPSActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AdminDisableUPSActionGroup">
12+
<annotations>
13+
<description>Disable United Parcel Service XML shipping method</description>
14+
</annotations>
15+
<conditionalClick selector="{{AdminShippingMethodUPSSection.UPSTab}}" dependentSelector="{{AdminShippingMethodUPSSection.handlingFee}}" visible="false" stepKey="maximizeUPSTab"/>
16+
<uncheckOption selector="{{AdminShippingMethodUPSSection.enableCheckoutCheckbox}}" stepKey="unCheckEnableForCheckoutCheckbox"/>
17+
<selectOption selector="{{AdminShippingMethodUPSSection.enableCheckoutSelect}}" userInput="No" stepKey="disableUPSCheckout"/>
18+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveDisabledUPSConfig"/>
19+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="assertDisabledUPSConfigurationSaved"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminEnableUPSActionGroup.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="AdminEnableUPSActionGroup">
12+
<annotations>
13+
<description>Enable United Parcel Service XML shipping method in backend</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="shipping" defaultValue="UPSShippingMethod"/>
17+
</arguments>
18+
<conditionalClick selector="{{AdminShippingMethodUPSSection.UPSTab}}" dependentSelector="{{AdminShippingMethodUPSSection.handlingFee}}" visible="false" stepKey="openUPSTab"/>
19+
<uncheckOption selector="{{AdminShippingMethodUPSSection.enableCheckoutCheckbox}}" stepKey="unCheckEnableForCheckout"/>
20+
<selectOption selector="{{AdminShippingMethodUPSSection.enableCheckoutSelect}}" userInput="{{shipping.enableCheckoutSelect}}" stepKey="selectEnableForCheckoutToYes"/>
21+
<fillField selector="{{AdminShippingMethodUPSSection.accessLicenseNumber}}" userInput="{{_CREDS.magento/carriers_ups_access_license_number}}" stepKey="enterAccessLicenseNumber"/>
22+
<fillField selector="{{AdminShippingMethodUPSSection.password}}" userInput="{{_CREDS.magento/carriers_ups_password}}" stepKey="enterPassword"/>
23+
<fillField selector="{{AdminShippingMethodUPSSection.username}}" userInput="{{_CREDS.magento/carriers_ups_username}}" stepKey="enterUsername"/>
24+
<uncheckOption selector="{{AdminShippingMethodUPSSection.modeCheckbox}}" stepKey="unCheckMode"/>
25+
<selectOption selector="{{AdminShippingMethodUPSSection.modeSelect}}" userInput="{{shipping.modeSelect}}" stepKey="selectModeToDevelopment"/>
26+
<fillField selector="{{AdminShippingMethodUPSSection.shipperNumberInput}}" userInput="{{_CREDS.magento/carriers_ups_shipper_number}}" stepKey="enterShipperNumber"/>
27+
<selectOption selector="{{AdminShippingMethodUPSSection.showMethodIfNotApplicableSelect}}" userInput="{{shipping.showMethodIfNotApplicableSelect}}" stepKey="selectShowMethodIfNotApplicableToYes"/>
28+
<selectOption selector="{{AdminShippingMethodUPSSection.debugSelect}}" userInput="{{shipping.debugSelect}}" stepKey="selectDebugToYes"/>
29+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
30+
<waitForText selector="{{AdminMessagesSection.success}}" userInput="You saved the configuration." stepKey="assertConfigurationSaved"/>
31+
</actionGroup>
32+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/Data/ShippingMethodData.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,17 @@
2020
<data key="applicableCountries">All Allowed Countries</data>
2121
<data key="showIfNotApplicable">No</data>
2222
</entity>
23-
</entities>
23+
<entity name="UPSShippingMethod" type="shipping">
24+
<data key="enableCheckoutSelect">Yes</data>
25+
<data key="modeSelect">Development</data>
26+
<data key="showMethodIfNotApplicableSelect">Yes</data>
27+
<data key="debugSelect">Yes</data>
28+
</entity>
29+
<entity name="USPSShippingMethodConfig" type="shipping">
30+
<data key="enableCheckoutSelectUSPS">Yes</data>
31+
<data key="gatewayURLInputUSPS">http://production.shippingapis.com/ShippingAPI.dll</data>
32+
<data key="secureGatewayURLInputUSPS">https://secure.shippingapis.com/ShippingAPI.dll</data>
33+
<data key="showMethodIfNotApplicableSelectUSPS">Yes</data>
34+
<data key="debugSelectUSPS">Yes</data>
35+
</entity>
36+
</entities>

‎app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodUPSSection.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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="AdminShippingMethodUPSSection">
12+
<element name="UPSTab" type="button" selector="//div[@class='section-config']//div[@class='entry-edit-head admin__collapsible-block']//a[@id='carriers_ups-head']"/>
13+
<element name="enableCheckoutCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_active']//td//input[@id='carriers_ups_active_inherit']"/>
14+
<element name="enableCheckoutSelect" type="select" selector="//tr[@id='row_carriers_ups_active']//td//select[@id='carriers_ups_active']"/>
15+
<element name="liveAccountCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_is_account_live']//td//input[@id='carriers_ups_is_account_live_inherit']"/>
16+
<element name="liveAccountSelect" type="select" selector="//tr[@id='row_carriers_ups_is_account_live']//td//select[@id='carriers_ups_is_account_live']"/>
17+
<element name="accessLicenseNumber" type="input" selector="//input[@id='carriers_ups_access_license_number']"/>
18+
<element name="originOfShipmentCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_origin_shipment']//td//input[@id='carriers_ups_origin_shipment_inherit']"/>
19+
<element name="originOfShipmentSelect" type="select" selector="//tr[@id='row_carriers_ups_origin_shipment']//td//select[@id='carriers_ups_origin_shipment']"/>
20+
<element name="password" type="input" selector="//input[@id='carriers_ups_password']"/>
21+
<element name="username" type="input" selector="//input[@id='carriers_ups_username']"/>
22+
<element name="modeSelect" type="select" selector="//tr[@id='row_carriers_ups_mode_xml']//td//select[@id='carriers_ups_mode_xml']"/>
23+
<element name="modeCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_mode_xml']//td//input[@id='carriers_ups_mode_xml_inherit']"/>
24+
<element name="gatewayURLCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_gateway_url']//td//input[@id='carriers_ups_gateway_url_inherit']"/>
25+
<element name="gatewayURLInput" type="input" selector="//tr[@id='row_carriers_ups_gateway_url']//td//input[@id='carriers_ups_gateway_url']"/>
26+
<element name="enableNegotiableRatesCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_negotiated_active']//td//input[@id='carriers_ups_negotiated_active_inherit']"/>
27+
<element name="enableNegotiableRatesInput" type="input" selector="//tr[@id='row_carriers_ups_negotiated_active']//td//select[@id='carriers_ups_negotiated_active']"/>
28+
<element name="shipperNumberInput" type="input" selector="//tr[@id='row_carriers_ups_shipper_number']//td//input[@id='carriers_ups_shipper_number']"/>
29+
<element name="containerSelect" type="select" selector="//tr[@id='row_carriers_ups_container']//td//select[@id='carriers_ups_container']"/>
30+
<element name="containerCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_container']//td//input[@id='carriers_ups_container_inherit']"/>
31+
<element name="destinationTypeSelect" type="select" selector="//tr[@id='row_carriers_ups_dest_type']//td//select[@id='carriers_ups_dest_type']"/>
32+
<element name="destinationTypeCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_dest_type']//td//input[@id='carriers_ups_dest_type_inherit']"/>
33+
<element name="weightUnitSelect" type="select" selector="//tr[@id='row_carriers_ups_unit_of_measure']//td//select[@id='carriers_ups_unit_of_measure']"/>
34+
<element name="weightUnitCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_unit_of_measure']//td//input[@id='carriers_ups_unit_of_measure_inherit']"/>
35+
<element name="trackingURLCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_tracking_url']//td//input[@id='carriers_ups_tracking_url_inherit']"/>
36+
<element name="trackingURLInput" type="input" selector="//tr[@id='row_carriers_ups_tracking_url']//td//input[@id='carriers_ups_tracking_url']"/>
37+
<element name="handlingFee" type="input" selector="//tr[@id='row_carriers_ups_handling_fee']//td//input[@id='carriers_ups_handling_fee']"/>
38+
<element name="showMethodIfNotApplicableSelect" type="select" selector="//tr[@id='row_carriers_ups_showmethod']//td//select[@id='carriers_ups_showmethod']"/>
39+
<element name="debugSelect" type="select" selector="//tr[@id='row_carriers_ups_debug']//td//select[@id='carriers_ups_debug']"/>
40+
</section>
41+
</sections>

‎app/code/Magento/Shipping/Test/Mftf/Test/StorefrontBillingAddressShownOnSecondCheckoutIfUPSEnabledTest.xml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="StorefrontBillingAddressShownOnSecondCheckoutIfUPSEnabledTest">
11+
<annotations>
12+
<features value="Shipping"/>
13+
<stories value="Test Billing address in checkout with UPS carrier"/>
14+
<title value="Billing address is shown on second checkout step if enable UPS and refresh page"/>
15+
<description value="Billing address is reflected correctly on second checkout step on refreshing payment checkout page post enabling UPS"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4334"/>
18+
<group value="3rd_party_integration"/>
19+
<group value="pr_exclude"/>
20+
</annotations>
21+
<before>
22+
<!--Login as Admin-->
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<!-- Create product -->
25+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
26+
<field key="price">100.00</field>
27+
</createData>
28+
<!-- Enabling Check/Money Order Payment Method -->
29+
<magentoCLI command="config:set {{EnableCheckMoneyOrderPaymentMethod.path}} {{EnableCheckMoneyOrderPaymentMethod.value}}" stepKey="enableCheckMoneyOrderPaymentMethod"/>
30+
<!--Enable Flat Rate shipping-->
31+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
32+
<!--Set Shipping settings origin data-->
33+
<actionGroup ref="AdminSetShippingOriginConfigActionGroup" stepKey="setShippingOriginConfigurationData">
34+
<argument name="country" value="United States"/>
35+
<argument name="state" value="California"/>
36+
<argument name="postcode" value="90034"/>
37+
</actionGroup>
38+
<!--Cache flush-->
39+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheWithUPSDisable">
40+
<argument name="tags" value="config full_page"/>
41+
</actionGroup>
42+
</before>
43+
<after>
44+
<!--Reset shipping origin-->
45+
<actionGroup ref="AdminResetShippingOriginConfigurationActionGroup" stepKey="resetShippingOriginConfig"/>
46+
<!--Navigate to shipping method configuration-->
47+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPageForDisablingUPS"/>
48+
<!--Configure UPS shipping method with enable for checkout = No-->
49+
<actionGroup ref="AdminDisableUPSActionGroup" stepKey="disableUPSShippingMethod"/>
50+
<!--delete product-->
51+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
52+
<!--Logout Admin-->
53+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
54+
</after>
55+
<!--Add simple product to cart-->
56+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
57+
<argument name="product" value="$$createSimpleProduct$$"/>
58+
</actionGroup>
59+
<!--Proceed to checkout-->
60+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="proceedToCheckout"/>
61+
<!--Enter shipping address & method-->
62+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillShippingAddressDetailsWithFlatRate">
63+
<argument name="customerVar" value="Simple_US_Utah_Customer"/>
64+
<argument name="customerAddressVar" value="US_Address_Florida"/>
65+
<argument name="shippingMethod" value="Flat Rate"/>
66+
</actionGroup>
67+
<!---Select payment method : Check/Money Order-->
68+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPayment"/>
69+
<!--Verify checkbox is checked for element "My billing and shipping address are the same"-->
70+
<seeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="seeCheckboxChecked"/>
71+
<!--Navigate to shipping method configuration for enabling UPS-->
72+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPageForEnablingUPS"/>
73+
<!--Configure UPS shipping method with enable for checkout = Yes-->
74+
<actionGroup ref="AdminEnableUPSActionGroup" stepKey="enableUPSShippingMethod">
75+
<argument name="shipping" value="UPSShippingMethod"/>
76+
</actionGroup>
77+
<!--Cache flush-->
78+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheWithUPSEnabled">
79+
<argument name="tags" value="config full_page"/>
80+
</actionGroup>
81+
<!--Refresh Checkout Page-->
82+
<amOnPage url="/checkout/#payment" stepKey="refreshStorefrontPaymentCheckoutPage"/>
83+
<!--Assert billing address is same & checkbox is checked for element "My billing and shipping address are the same"-->
84+
<actionGroup ref="CheckBillingAddressInCheckoutWithBillingAddressOnPaymentPageActionGroup" stepKey="assertBillingAddressPostRefresh">
85+
<argument name="customerVar" value="Simple_US_Utah_Customer"/>
86+
<argument name="customerAddressVar" value="US_Address_Florida"/>
87+
</actionGroup>
88+
<seeCheckboxIsChecked selector="{{CheckoutPaymentSection.billingAddressNotSameCheckbox}}" stepKey="seeCheckboxCheckedPostRefresh"/>
89+
<!--Navigate to shipping method section-->
90+
<amOnPage url="/checkout/#shipping" stepKey="navigateStorefrontBillingAndShippingDetailsPage"/>
91+
<!--Enter Shipping details & select UPS shipping method-->
92+
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillShippingAddressDetailsWithUPS">
93+
<argument name="customerVar" value="Simple_US_Utah_Customer"/>
94+
<argument name="customerAddressVar" value="US_Address_Florida"/>
95+
<argument name="shippingMethod" value="United Parcel Service"/>
96+
</actionGroup>
97+
<!---Select payment method : Check/Money Order-->
98+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="clickCheckMoneyOrderPaymentAgain"/>
99+
<!-- Place Order -->
100+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrderButton"/>
101+
<!--grab order number-->
102+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber}}" stepKey="grabOrderNumber"/>
103+
<!--navigate to orders grid-->
104+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToAdminSalesOrders"/>
105+
<!--filter order by ID-->
106+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
107+
<argument name="orderId" value="$grabOrderNumber"/>
108+
</actionGroup>
109+
<!--assert order ID-->
110+
<assertNotEmpty stepKey="assertOrderIdIsNotEmpty">
111+
<actualResult type="const">$grabOrderNumber</actualResult>
112+
</assertNotEmpty>
113+
</test>
114+
</tests>

0 commit comments

Comments
 (0)