Skip to content

Commit e28f0f6

Browse files
author
Roman Liukshyn
committed
MTA-561: Re-factor Tests for Onepage Checkout with Online Shipping Carrier
- convert repository and fixtures to xml format -updated test preparation and tear down
1 parent 30975d6 commit e28f0f6

File tree

6 files changed

+73
-3
lines changed

6 files changed

+73
-3
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,29 @@
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>
23+
24+
<dataset name="dhl_eu_rollback">
25+
<field path="carriers/dhl/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
26+
</dataset>
27+
28+
<dataset name="dhl_us">
29+
<field path="carriers/dhl/active" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
30+
<field path="carriers/dhl/gateway_url" scope="carriers" scope_id="1" label="" xsi:type="string">https://xmlpi-ea.dhl.com/XMLShippingServlet</field>
31+
<field path="carriers/dhl/id" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_id_us%</field>
32+
<field path="carriers/dhl/password" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_password_us%</field>
33+
<field path="carriers/dhl/account" scope="carriers" scope_id="1" label="" xsi:type="string">%carriers_dhl_account_us%</field>
34+
<field path="carriers/dhl/showmethod" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
35+
<field path="carriers/dhl/debug" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
36+
</dataset>
37+
38+
<dataset name="dhl_us_rollback">
39+
<field path="carriers/dhl/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
40+
</dataset>
2341
</storage>
2442
</repository>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,37 @@
3232
<item label="US Dollar" xsi:type="string">USD</item>
3333
</field>
3434
</dataset>
35+
36+
<dataset name="config_base_currency_ch">
37+
<field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
38+
<item label="Swiss Franc" xsi:type="string">CHF</item>
39+
</field>
40+
<field path="currency/options/base" scope="currency" label="Swiss Franc" scope_id="1" xsi:type="string">CHF</field>
41+
<field path="currency/options/default" scope="currency" label="Swiss Franc" scope_id="1" xsi:type="string">CHF</field>
42+
</dataset>
43+
44+
<dataset name="config_base_currency_ch_rollback">
45+
<field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
46+
<item label="US Dollar" xsi:type="string">USD</item>
47+
</field>
48+
<field path="currency/options/base" scope="currency" label="US Dollar" scope_id="1" xsi:type="string">USD</field>
49+
<field path="currency/options/default" scope="currency" label="US Dollar" scope_id="1" xsi:type="string">USD</field>
50+
</dataset>
51+
52+
<dataset name="config_base_currency_gb">
53+
<field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
54+
<item label="British Pound Sterling" xsi:type="string">GBP</item>
55+
</field>
56+
<field path="currency/options/base" scope="currency" label="British Pound Sterling" scope_id="1" xsi:type="string">GBP</field>
57+
<field path="currency/options/default" scope="currency" label="British Pound Sterling" scope_id="1" xsi:type="string">GBP</field>
58+
</dataset>
59+
60+
<dataset name="config_base_currency_gb_rollback">
61+
<field path="currency/options/allow" scope="currency" scope_id="1" xsi:type="array">
62+
<item label="US Dollar" xsi:type="string">USD</item>
63+
</field>
64+
<field path="currency/options/base" scope="currency" label="US Dollar" scope_id="1" xsi:type="string">USD</field>
65+
<field path="currency/options/default" scope="currency" label="US Dollar" scope_id="1" xsi:type="string">USD</field>
66+
</dataset>
3567
</storage>
3668
</repository>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,9 @@
1919
<field path="carriers/fedex/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_FEDEX_PASSWORD</field>
2020
<field path="carriers/fedex/sandbox_mode" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
2121
</dataset>
22+
23+
<dataset name="fedex_rollback">
24+
<field path="carriers/fedex/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
25+
</dataset>
2226
</storage>
2327
</repository>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,13 @@
2323
<field path="shipping/origin/city" scope="shipping" scope_id="1" label="" xsi:type="string">Los Angeles</field>
2424
<field path="shipping/origin/street_line1" scope="shipping" scope_id="1" label="" xsi:type="string">1419 Westwood Blvd</field>
2525
</dataset>
26+
27+
<dataset name="shipping_origin_CH">
28+
<field path="shipping/origin/country_id" scope="carriers" scope_id="1" label="United Kingdom" xsi:type="string">CH</field>
29+
<field path="shipping/origin/region_id" scope="shipping" scope_id="1" label="Bern" xsi:type="string">107</field>
30+
<field path="shipping/origin/postcode" scope="shipping" scope_id="1" label="" xsi:type="string">3005</field>
31+
<field path="shipping/origin/city" scope="shipping" scope_id="1" label="" xsi:type="string">Bern</field>
32+
<field path="shipping/origin/street_line1" scope="shipping" scope_id="1" label="" xsi:type="string">Weinbergstrasse 4</field>
33+
</dataset>
2634
</storage>
2735
</repository>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,9 @@
4545
<field path="carriers/ups/showmethod" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
4646
<field path="carriers/ups/debug" scope="carriers" scope_id="1" label="Yes" xsi:type="string">1</field>
4747
</dataset>
48+
49+
<dataset name="ups_rollback">
50+
<field path="carriers/ups/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
51+
</dataset>
4852
</storage>
4953
</repository>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,9 @@
1818
<field path="carriers/usps/userid" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_USPS_USERID</field>
1919
<field path="carriers/usps/password" scope="carriers" scope_id="1" label="" xsi:type="string">CARRIERS_USPS_PASSWORD</field>
2020
</dataset>
21+
22+
<dataset name="usps_rollback">
23+
<field path="carriers/usps/active" scope="carriers" scope_id="1" label="No" xsi:type="string">0</field>
24+
</dataset>
2125
</storage>
2226
</repository>

0 commit comments

Comments
 (0)