Skip to content

Commit 8b13c68

Browse files
author
Roman Liukshyn
committed
MTA-561: Re-factor Tests for Onepage Checkout with Online Shipping Carrier
- CR Changes
1 parent 171e284 commit 8b13c68

File tree

6 files changed

+181
-17
lines changed

6 files changed

+181
-17
lines changed

‎dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,4 @@
2020
<step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
2121
<step name="placeOrder" module="Magento_Checkout"/>
2222
</scenario>
23-
24-
<scenario name="OnePageCheckoutWithOnlineShippingMethodsTest" firstStep="setupConfiguration">
25-
<step name="setupConfiguration" module="Magento_Core" next="createProducts"/>
26-
<step name="createProducts" module="Magento_Catalog" next="addProductsToTheCart"/>
27-
<step name="addProductsToTheCart" module="Magento_Checkout" next="estimateShippingAndTax"/>
28-
<step name="estimateShippingAndTax" module="Magento_Checkout" next="proceedToCheckout"/>
29-
<step name="proceedToCheckout" module="Magento_Checkout" next="createCustomer"/>
30-
<step name="createCustomer" module="Magento_Customer" next="selectCheckoutMethod"/>
31-
<step name="selectCheckoutMethod" module="Magento_Checkout" next="fillBillingInformation"/>
32-
<step name="fillBillingInformation" module="Magento_Checkout" next="fillShippingMethod"/>
33-
<step name="fillShippingMethod" module="Magento_Checkout" next="selectPaymentMethod"/>
34-
<step name="selectPaymentMethod" module="Magento_Checkout" next="placeOrder"/>
35-
<step name="placeOrder" module="Magento_Checkout"/>
36-
</scenario>
3723
</config>

‎dev/tests/functional/tests/app/Magento/Dhl/Test/Repository/ConfigData.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<dataset name="dhl_eu">
1515
<field path="carriers/dhl/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
1616
<field path="carriers/dhl/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://xmlpitest-ea.dhl.com/XMLShippingServlet</field>
17-
<field path="carriers/dhl/id" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_ID</field>
18-
<field path="carriers/dhl/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_PASSWORD</field>
19-
<field path="carriers/dhl/account" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_DHL_ACCOUNT</field>
17+
<field path="carriers/dhl/id" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_id_eu%</field>
18+
<field path="carriers/dhl/password" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_password_eu%</field>
19+
<field path="carriers/dhl/account" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_account_eu%</field>
2020
<field path="carriers/dhl/showmethod" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
2121
<field path="carriers/dhl/debug" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
2222
</dataset>

‎dev/tests/functional/tests/app/Magento/Dhl/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
10+
<variation name="OnePageCheckoutTestVariation20">
11+
<data name="description" xsi:type="string">MAGETWO-12850 – Use DHL International (EU) Online Shipping Carrier on Checkout as a Registered Customer</data>
12+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
13+
<data name="checkoutMethod" xsi:type="string">login</data>
14+
<data name="customer/dataSet" xsi:type="string">customer_DE</data>
15+
<data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
16+
<data name="shipping/shipping_service" xsi:type="string">DHL</data>
17+
<data name="shipping/shipping_method" xsi:type="string">Express worldwide</data>
18+
<data name="cart/data/shipping_service" xsi:type="string">DHL</data>
19+
<data name="cart/data/shipping_method" xsi:type="string">Express worldwide</data>
20+
<data name="payment/method" xsi:type="string">checkmo</data>
21+
<data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
22+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
23+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
24+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
26+
</variation>
27+
<variation name="OnePageCheckoutTestVariation21">
28+
<data name="description" xsi:type="string">MAGETWO-12851 – Use DHL International (US) Online Shipping Carrier on Checkout as a Registered Customer</data>
29+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
30+
<data name="checkoutMethod" xsi:type="string">login</data>
31+
<data name="customer/dataSet" xsi:type="string">customer_US</data>
32+
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
33+
<data name="shipping/shipping_service" xsi:type="string">DHL</data>
34+
<data name="shipping/shipping_method" xsi:type="string">Domestic express</data>
35+
<data name="cart/data/shipping_service" xsi:type="string">DHL</data>
36+
<data name="cart/data/shipping_method" xsi:type="string">Domestic express</data>
37+
<data name="payment/method" xsi:type="string">checkmo</data>
38+
<data name="configData" xsi:type="string">checkmo, dhl_us, shipping_origin_US_CA</data>
39+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
40+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
41+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
42+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
43+
</variation>
44+
</testCase>
45+
</config>

‎dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
10+
<variation name="OnePageCheckoutTestVariation22">
11+
<data name="description" xsi:type="string">Checkout as guest using FedEx with US shipping origin and UK customer</data>
12+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
13+
<data name="checkoutMethod" xsi:type="string">guest</data>
14+
<data name="customer/dataSet" xsi:type="string">customer_UK</data>
15+
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
16+
<data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
17+
<data name="shipping/shipping_method" xsi:type="string">International Economy</data>
18+
<data name="cart/data/shipping_service" xsi:type="string">Federal Express</data>
19+
<data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
20+
<data name="payment/method" xsi:type="string">checkmo</data>
21+
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
22+
<data name="issue" xsi:type="string">Rating is temporarily unavailable - Error in FEDEX</data>
23+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
24+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
26+
</variation>
27+
<variation name="OnePageCheckoutTestVariation23">
28+
<data name="description" xsi:type="string">MAGETWO-12849 – Use FedEx Online Shipping Carrier on Checkout as a Registered Customer</data>
29+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
30+
<data name="checkoutMethod" xsi:type="string">login</data>
31+
<data name="customer/dataSet" xsi:type="string">customer_DE</data>
32+
<data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
33+
<data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
34+
<data name="shipping/shipping_method" xsi:type="string">Ground</data>
35+
<data name="cart/data/shipping_service" xsi:type="string">Federal Express</data>
36+
<data name="cart/data/shipping_method" xsi:type="string">Ground</data>
37+
<data name="payment/method" xsi:type="string">checkmo</data>
38+
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
39+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
40+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
41+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
42+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
43+
</variation>
44+
</testCase>
45+
</config>

‎dev/tests/functional/tests/app/Magento/Ups/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
10+
<variation name="OnePageCheckoutTestVariation24">
11+
<data name="description" xsi:type="string">MAGETWO-12848 – Use UPS Online Shipping Carrier on Checkout as a Registered Customer</data>
12+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
13+
<data name="checkoutMethod" xsi:type="string">login</data>
14+
<data name="customer/dataSet" xsi:type="string">customer_US</data>
15+
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
16+
<data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
17+
<data name="shipping/shipping_method" xsi:type="string">UPS Ground</data>
18+
<data name="cart/data/shipping_service" xsi:type="string">United Parcel Service</data>
19+
<data name="cart/data/shipping_method" xsi:type="string">UPS Ground</data>
20+
<data name="payment/method" xsi:type="string">checkmo</data>
21+
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
22+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
23+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
24+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
26+
</variation>
27+
<variation name="OnePageCheckoutTestVariation25">
28+
<data name="description" xsi:type="string">Checkout as guest using UPS with US shipping origin and UK customer</data>
29+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
30+
<data name="checkoutMethod" xsi:type="string">guest</data>
31+
<data name="customer/dataSet" xsi:type="string">customer_UK</data>
32+
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
33+
<data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
34+
<data name="shipping/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
35+
<data name="cart/data/shipping_service" xsi:type="string">United Parcel Service</data>
36+
<data name="cart/data/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
37+
<data name="payment/method" xsi:type="string">checkmo</data>
38+
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
39+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
40+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
41+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
42+
</variation>
43+
</testCase>
44+
</config>

‎dev/tests/functional/tests/app/Magento/Usps/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Checkout\Test\TestCase\OnePageCheckoutTest">
10+
<variation name="OnePageCheckoutTestVariation26">
11+
<data name="description" xsi:type="string">MAGETWO-12444 – Use USPS Online Shipping Carrier on Checkout as a Registered Customer</data>
12+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
13+
<data name="checkoutMethod" xsi:type="string">login</data>
14+
<data name="customer/dataSet" xsi:type="string">customer_US</data>
15+
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
16+
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
17+
<data name="shipping/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
18+
<data name="cart/data/shipping_service" xsi:type="string">United States Postal Service</data>
19+
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
20+
<data name="payment/method" xsi:type="string">checkmo</data>
21+
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
22+
<data name="tag" xsi:type="string">test_type:3rd_party_test</data>
23+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
24+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
25+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
26+
</variation>
27+
<variation name="OnePageCheckoutTestVariation27">
28+
<data name="description" xsi:type="string">Checkout as guest using USPS with US shipping origin and UK customer</data>
29+
<data name="products" xsi:type="string">catalogProductSimple::default, configurableProduct::default, bundleProduct::bundle_fixed_product</data>
30+
<data name="checkoutMethod" xsi:type="string">guest</data>
31+
<data name="customer/dataSet" xsi:type="string">customer_UK</data>
32+
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
33+
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
34+
<data name="shipping/shipping_method" xsi:type="string">Priority Mail International</data>
35+
<data name="cart/data/shipping_service" xsi:type="string">United States Postal Service</data>
36+
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail International</data>
37+
<data name="payment/method" xsi:type="string">checkmo</data>
38+
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
39+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
40+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid"/>
41+
<constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty"/>
42+
</variation>
43+
</testCase>
44+
</config>

0 commit comments

Comments
 (0)