Skip to content

Commit 03079fa

Browse files
author
Roman Liukshyn
committed
MTA-561: Re-factor Tests for Onepage Checkout with Online Shipping Carrier
1 parent d76a753 commit 03079fa

File tree

5 files changed

+160
-165
lines changed

5 files changed

+160
-165
lines changed

‎dev/tests/functional/tests/app/Magento/Checkout/Test/Fixture/Cart.xml

Lines changed: 160 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -6,161 +6,164 @@
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
9-
<fixture name="cart" module="Magento_Checkout" type="flat" entity_type="quote" repository_class="Magento\Checkout\Test\Repository\Cart" handler_interface="Magento\Checkout\Test\Handler\Cart\CartInterface" class="Magento\Checkout\Test\Fixture\Cart">
10-
<field name="entity_id" is_required="1">
11-
<default_value xsi:type="null"/>
12-
</field>
13-
<field name="store_id" is_required="">
14-
<default_value xsi:type="number">0</default_value>
15-
</field>
16-
<field name="created_at" is_required="">
17-
<default_value xsi:type="string">CURRENT_TIMESTAMP</default_value>
18-
</field>
19-
<field name="updated_at" is_required="">
20-
<default_value xsi:type="string">0000-00-00 00:00:00</default_value>
21-
</field>
22-
<field name="converted_at" is_required="">
23-
<default_value xsi:type="null"/>
24-
</field>
25-
<field name="is_active" is_required="">
26-
<default_value xsi:type="string">1</default_value>
27-
</field>
28-
<field name="is_virtual" is_required="">
29-
<default_value xsi:type="number">0</default_value>
30-
</field>
31-
<field name="is_multi_shipping" is_required="">
32-
<default_value xsi:type="number">0</default_value>
33-
</field>
34-
<field name="items" source="Magento\Checkout\Test\Fixture\Cart\Items"/>
35-
<field name="items_count" is_required="">
36-
<default_value xsi:type="number">0</default_value>
37-
</field>
38-
<field name="items_qty" is_required="">
39-
<default_value xsi:type="string">0.0000</default_value>
40-
</field>
41-
<field name="orig_order_id" is_required="">
42-
<default_value xsi:type="number">0</default_value>
43-
</field>
44-
<field name="store_to_base_rate" is_required="">
45-
<default_value xsi:type="string">0.0000</default_value>
46-
</field>
47-
<field name="store_to_quote_rate" is_required="">
48-
<default_value xsi:type="string">0.0000</default_value>
49-
</field>
50-
<field name="base_currency_code" is_required="">
51-
<default_value xsi:type="null"/>
52-
</field>
53-
<field name="store_currency_code" is_required="">
54-
<default_value xsi:type="null"/>
55-
</field>
56-
<field name="quote_currency_code" is_required="">
57-
<default_value xsi:type="null"/>
58-
</field>
59-
<field name="grand_total" is_required="">
60-
<default_value xsi:type="string">0.0000</default_value>
61-
</field>
62-
<field name="base_grand_total" is_required="">
63-
<default_value xsi:type="string">0.0000</default_value>
64-
</field>
65-
<field name="checkout_method" is_required="">
66-
<default_value xsi:type="null"/>
67-
</field>
68-
<field name="customer_id" is_required="">
69-
<default_value xsi:type="number">0</default_value>
70-
</field>
71-
<field name="customer_tax_class_id" is_required="">
72-
<default_value xsi:type="number">0</default_value>
73-
</field>
74-
<field name="customer_group_id" is_required="">
75-
<default_value xsi:type="number">0</default_value>
76-
</field>
77-
<field name="customer_email" is_required="">
78-
<default_value xsi:type="null"/>
79-
</field>
80-
<field name="customer_prefix" is_required="">
81-
<default_value xsi:type="null"/>
82-
</field>
83-
<field name="customer_firstname" is_required="">
84-
<default_value xsi:type="null"/>
85-
</field>
86-
<field name="customer_middlename" is_required="">
87-
<default_value xsi:type="null"/>
88-
</field>
89-
<field name="customer_lastname" is_required="">
90-
<default_value xsi:type="null"/>
91-
</field>
92-
<field name="customer_suffix" is_required="">
93-
<default_value xsi:type="null"/>
94-
</field>
95-
<field name="customer_dob" is_required="">
96-
<default_value xsi:type="null"/>
97-
</field>
98-
<field name="customer_note" is_required="">
99-
<default_value xsi:type="null"/>
100-
</field>
101-
<field name="customer_note_notify" is_required="">
102-
<default_value xsi:type="string">1</default_value>
103-
</field>
104-
<field name="customer_is_guest" is_required="">
105-
<default_value xsi:type="number">0</default_value>
106-
</field>
107-
<field name="remote_ip" is_required="">
108-
<default_value xsi:type="null"/>
109-
</field>
110-
<field name="applied_rule_ids" is_required="">
111-
<default_value xsi:type="null"/>
112-
</field>
113-
<field name="reserved_order_id" is_required="">
114-
<default_value xsi:type="null"/>
115-
</field>
116-
<field name="password_hash" is_required="">
117-
<default_value xsi:type="null"/>
118-
</field>
119-
<field name="coupon_code" is_required="">
120-
<default_value xsi:type="null"/>
121-
</field>
122-
<field name="global_currency_code" is_required="">
123-
<default_value xsi:type="null"/>
124-
</field>
125-
<field name="base_to_global_rate" is_required="">
126-
<default_value xsi:type="null"/>
127-
</field>
128-
<field name="base_to_quote_rate" is_required="">
129-
<default_value xsi:type="null"/>
130-
</field>
131-
<field name="customer_taxvat" is_required="">
132-
<default_value xsi:type="null"/>
133-
</field>
134-
<field name="customer_gender" is_required="">
135-
<default_value xsi:type="null"/>
136-
</field>
137-
<field name="subtotal" is_required="">
138-
<default_value xsi:type="null"/>
139-
</field>
140-
<field name="base_subtotal" is_required="">
141-
<default_value xsi:type="null"/>
142-
</field>
143-
<field name="subtotal_with_discount" is_required="">
144-
<default_value xsi:type="null"/>
145-
</field>
146-
<field name="base_subtotal_with_discount" is_required="">
147-
<default_value xsi:type="null"/>
148-
</field>
149-
<field name="is_changed" is_required="">
150-
<default_value xsi:type="null"/>
151-
</field>
152-
<field name="trigger_recollec" is_required="">
153-
<default_value xsi:type="number">0</default_value>
154-
</field>
155-
<field name="ext_shipping_info" is_required="">
156-
<default_value xsi:type="null"/>
157-
</field>
158-
<field name="is_persistent" is_required="">
159-
<default_value xsi:type="number">0</default_value>
160-
</field>
161-
<field name="gift_message_id" is_required="">
162-
<default_value xsi:type="null"/>
163-
</field>
164-
<field name="checkout_data" group="" source="Magento\Checkout\Test\Fixture\Cart\CheckoutData"/>
165-
</fixture>
9+
<fixture name="cart" module="Magento_Checkout" type="flat" entity_type="quote" repository_class="Magento\Checkout\Test\Repository\Cart" handler_interface="Magento\Checkout\Test\Handler\Cart\CartInterface" class="Magento\Checkout\Test\Fixture\Cart">
10+
<field name="entity_id" is_required="1">
11+
<default_value xsi:type="null"/>
12+
</field>
13+
<field name="store_id" is_required="">
14+
<default_value xsi:type="number">0</default_value>
15+
</field>
16+
<field name="created_at" is_required="">
17+
<default_value xsi:type="string">CURRENT_TIMESTAMP</default_value>
18+
</field>
19+
<field name="updated_at" is_required="">
20+
<default_value xsi:type="string">0000-00-00 00:00:00</default_value>
21+
</field>
22+
<field name="converted_at" is_required="">
23+
<default_value xsi:type="null"/>
24+
</field>
25+
<field name="is_active" is_required="">
26+
<default_value xsi:type="string">1</default_value>
27+
</field>
28+
<field name="is_virtual" is_required="">
29+
<default_value xsi:type="number">0</default_value>
30+
</field>
31+
<field name="is_multi_shipping" is_required="">
32+
<default_value xsi:type="number">0</default_value>
33+
</field>
34+
<field name="items" source="Magento\Checkout\Test\Fixture\Cart\Items"/>
35+
<field name="items_count" is_required="">
36+
<default_value xsi:type="number">0</default_value>
37+
</field>
38+
<field name="items_qty" is_required="">
39+
<default_value xsi:type="string">0.0000</default_value>
40+
</field>
41+
<field name="orig_order_id" is_required="">
42+
<default_value xsi:type="number">0</default_value>
43+
</field>
44+
<field name="store_to_base_rate" is_required="">
45+
<default_value xsi:type="string">0.0000</default_value>
46+
</field>
47+
<field name="store_to_quote_rate" is_required="">
48+
<default_value xsi:type="string">0.0000</default_value>
49+
</field>
50+
<field name="base_currency_code" is_required="">
51+
<default_value xsi:type="null"/>
52+
</field>
53+
<field name="store_currency_code" is_required="">
54+
<default_value xsi:type="null"/>
55+
</field>
56+
<field name="quote_currency_code" is_required="">
57+
<default_value xsi:type="null"/>
58+
</field>
59+
<field name="grand_total" is_required="">
60+
<default_value xsi:type="string">0.0000</default_value>
61+
</field>
62+
<field name="base_grand_total" is_required="">
63+
<default_value xsi:type="string">0.0000</default_value>
64+
</field>
65+
<field name="checkout_method" is_required="">
66+
<default_value xsi:type="null"/>
67+
</field>
68+
<field name="customer_id" is_required="">
69+
<default_value xsi:type="number">0</default_value>
70+
</field>
71+
<field name="customer_tax_class_id" is_required="">
72+
<default_value xsi:type="number">0</default_value>
73+
</field>
74+
<field name="customer_group_id" is_required="">
75+
<default_value xsi:type="number">0</default_value>
76+
</field>
77+
<field name="customer_email" is_required="">
78+
<default_value xsi:type="null"/>
79+
</field>
80+
<field name="customer_prefix" is_required="">
81+
<default_value xsi:type="null"/>
82+
</field>
83+
<field name="customer_firstname" is_required="">
84+
<default_value xsi:type="null"/>
85+
</field>
86+
<field name="customer_middlename" is_required="">
87+
<default_value xsi:type="null"/>
88+
</field>
89+
<field name="customer_lastname" is_required="">
90+
<default_value xsi:type="null"/>
91+
</field>
92+
<field name="customer_suffix" is_required="">
93+
<default_value xsi:type="null"/>
94+
</field>
95+
<field name="customer_dob" is_required="">
96+
<default_value xsi:type="null"/>
97+
</field>
98+
<field name="customer_note" is_required="">
99+
<default_value xsi:type="null"/>
100+
</field>
101+
<field name="customer_note_notify" is_required="">
102+
<default_value xsi:type="string">1</default_value>
103+
</field>
104+
<field name="customer_is_guest" is_required="">
105+
<default_value xsi:type="number">0</default_value>
106+
</field>
107+
<field name="remote_ip" is_required="">
108+
<default_value xsi:type="null"/>
109+
</field>
110+
<field name="applied_rule_ids" is_required="">
111+
<default_value xsi:type="null"/>
112+
</field>
113+
<field name="reserved_order_id" is_required="">
114+
<default_value xsi:type="null"/>
115+
</field>
116+
<field name="password_hash" is_required="">
117+
<default_value xsi:type="null"/>
118+
</field>
119+
<field name="coupon_code" is_required="">
120+
<default_value xsi:type="null"/>
121+
</field>
122+
<field name="global_currency_code" is_required="">
123+
<default_value xsi:type="null"/>
124+
</field>
125+
<field name="base_to_global_rate" is_required="">
126+
<default_value xsi:type="null"/>
127+
</field>
128+
<field name="base_to_quote_rate" is_required="">
129+
<default_value xsi:type="null"/>
130+
</field>
131+
<field name="customer_taxvat" is_required="">
132+
<default_value xsi:type="null"/>
133+
</field>
134+
<field name="customer_gender" is_required="">
135+
<default_value xsi:type="null"/>
136+
</field>
137+
<field name="subtotal" is_required="">
138+
<default_value xsi:type="null"/>
139+
</field>
140+
<field name="base_subtotal" is_required="">
141+
<default_value xsi:type="null"/>
142+
</field>
143+
<field name="subtotal_with_discount" is_required="">
144+
<default_value xsi:type="null"/>
145+
</field>
146+
<field name="base_subtotal_with_discount" is_required="">
147+
<default_value xsi:type="null"/>
148+
</field>
149+
<field name="is_changed" is_required="">
150+
<default_value xsi:type="null"/>
151+
</field>
152+
<field name="trigger_recollec" is_required="">
153+
<default_value xsi:type="number">0</default_value>
154+
</field>
155+
<field name="ext_shipping_info" is_required="">
156+
<default_value xsi:type="null"/>
157+
</field>
158+
<field name="is_persistent" is_required="">
159+
<default_value xsi:type="number">0</default_value>
160+
</field>
161+
<field name="gift_message_id" is_required="">
162+
<default_value xsi:type="null"/>
163+
</field>
164+
<field name="shipping_method" is_required="">
165+
<default_value xsi:type="null"/>
166+
</field>
167+
<field name="checkout_data" group="" source="Magento\Checkout\Test\Fixture\Cart\CheckoutData"/>
168+
</fixture>
166169
</config>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
1616
<data name="shipping/shipping_service" xsi:type="string">DHL</data>
1717
<data name="shipping/shipping_method" xsi:type="string">Express worldwide</data>
18-
<data name="cart/data/shipping_service" xsi:type="string">DHL</data>
1918
<data name="cart/data/shipping_method" xsi:type="string">Express worldwide</data>
2019
<data name="payment/method" xsi:type="string">checkmo</data>
2120
<data name="configData" xsi:type="string">checkmo, dhl_eu, shipping_origin_CH, config_base_currency_ch</data>
@@ -32,7 +31,6 @@
3231
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
3332
<data name="shipping/shipping_service" xsi:type="string">DHL</data>
3433
<data name="shipping/shipping_method" xsi:type="string">Domestic express</data>
35-
<data name="cart/data/shipping_service" xsi:type="string">DHL</data>
3634
<data name="cart/data/shipping_method" xsi:type="string">Domestic express</data>
3735
<data name="payment/method" xsi:type="string">checkmo</data>
3836
<data name="configData" xsi:type="string">checkmo, dhl_us, shipping_origin_US_CA</data>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
1616
<data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
1717
<data name="shipping/shipping_method" xsi:type="string">International Economy</data>
18-
<data name="cart/data/shipping_service" xsi:type="string">Federal Express</data>
1918
<data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
2019
<data name="payment/method" xsi:type="string">checkmo</data>
2120
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
@@ -32,7 +31,6 @@
3231
<data name="billingAddress/dataSet" xsi:type="string">customer_DE</data>
3332
<data name="shipping/shipping_service" xsi:type="string">Federal Express</data>
3433
<data name="shipping/shipping_method" xsi:type="string">Ground</data>
35-
<data name="cart/data/shipping_service" xsi:type="string">Federal Express</data>
3634
<data name="cart/data/shipping_method" xsi:type="string">Ground</data>
3735
<data name="payment/method" xsi:type="string">checkmo</data>
3836
<data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
1616
<data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
1717
<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>
1918
<data name="cart/data/shipping_method" xsi:type="string">UPS Ground</data>
2019
<data name="payment/method" xsi:type="string">checkmo</data>
2120
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>
@@ -32,7 +31,6 @@
3231
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
3332
<data name="shipping/shipping_service" xsi:type="string">United Parcel Service</data>
3433
<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>
3634
<data name="cart/data/shipping_method" xsi:type="string">UPS Worldwide Expedited</data>
3735
<data name="payment/method" xsi:type="string">checkmo</data>
3836
<data name="configData" xsi:type="string">checkmo, ups, shipping_origin_US_CA</data>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<data name="billingAddress/dataSet" xsi:type="string">customer_US</data>
1616
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
1717
<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>
1918
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail 1-Day</data>
2019
<data name="payment/method" xsi:type="string">checkmo</data>
2120
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>
@@ -32,7 +31,6 @@
3231
<data name="billingAddress/dataSet" xsi:type="string">customer_UK</data>
3332
<data name="shipping/shipping_service" xsi:type="string">United States Postal Service</data>
3433
<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>
3634
<data name="cart/data/shipping_method" xsi:type="string">Priority Mail International</data>
3735
<data name="payment/method" xsi:type="string">checkmo</data>
3836
<data name="configData" xsi:type="string">checkmo, usps, shipping_origin_US_CA</data>

0 commit comments

Comments
 (0)