Skip to content

Commit 762bbca

Browse files
mkovdryshmkovdrysh
committed
MC-12599: Checkout can properly process flow if list of shipping carriers are changed during place order
Fixed: MC-4461
1 parent 4bbec5a commit 762bbca

12 files changed

+101
-28
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<!-- Free shipping -->
12+
<entity name="EnableFreeShippingConfigData">
13+
<data key="path">carriers/freeshipping/active</data>
14+
<data key="scope">carriers</data>
15+
<data key="scope_id">1</data>
16+
<data key="label">Yes</data>
17+
<data key="value">1</data>
18+
</entity>
19+
<entity name="EnableFreeShippingToSpecificCountriesConfigData">
20+
<data key="path">carriers/freeshipping/sallowspecific</data>
21+
<data key="scope">carriers</data>
22+
<data key="scope_id">1</data>
23+
<data key="label">Specific Countries</data>
24+
<data key="value">1</data>
25+
</entity>
26+
<entity name="EnableFreeShippingToAfghanistanConfigData">
27+
<data key="path">carriers/freeshipping/specificcountry</data>
28+
<data key="scope">carriers</data>
29+
<data key="scope_id">1</data>
30+
<data key="label">Afghanistan</data>
31+
<data key="value">AF</data>
32+
</entity>
33+
<entity name="EnableFreeShippingToAllAllowedCountriesConfigData">
34+
<data key="path">carriers/freeshipping/sallowspecific</data>
35+
<data key="scope">carriers</data>
36+
<data key="scope_id">1</data>
37+
<data key="label">All Allowed Countries</data>
38+
<data key="value">0</data>
39+
</entity>
40+
<entity name="DisableFreeShippingConfigData">
41+
<data key="path">carriers/freeshipping/active</data>
42+
<data key="scope">carriers</data>
43+
<data key="scope_id">1</data>
44+
<data key="label">No</data>
45+
<data key="value">0</data>
46+
</entity>
47+
48+
<!-- Flat Rate shipping -->
49+
<entity name="EnableFlatRateConfigData">
50+
<data key="path">carriers/flatrate/active</data>
51+
<data key="scope">carriers</data>
52+
<data key="scope_id">1</data>
53+
<data key="label">Yes</data>
54+
<data key="value">1</data>
55+
</entity>
56+
<entity name="EnableFlatRateToSpecificCountriesConfigData">
57+
<data key="path">carriers/flatrate/sallowspecific</data>
58+
<data key="scope">carriers</data>
59+
<data key="scope_id">1</data>
60+
<data key="label">Specific Countries</data>
61+
<data key="value">1</data>
62+
</entity>
63+
<entity name="EnableFlatRateToAfghanistanConfigData">
64+
<data key="path">carriers/flatrate/specificcountry</data>
65+
<data key="scope">carriers</data>
66+
<data key="scope_id">1</data>
67+
<data key="label">Afghanistan</data>
68+
<data key="value">AF</data>
69+
</entity>
70+
<entity name="EnableFlatRateToAllAllowedCountriesConfigData">
71+
<data key="path">carriers/flatrate/sallowspecific</data>
72+
<data key="scope">carriers</data>
73+
<data key="scope_id">1</data>
74+
<data key="label">All Allowed Countries</data>
75+
<data key="value">0</data>
76+
</entity>
77+
<entity name="DisableFlatRateConfigData">
78+
<data key="path">carriers/flatrate/active</data>
79+
<data key="scope">carriers</data>
80+
<data key="scope_id">1</data>
81+
<data key="label">No</data>
82+
<data key="value">0</data>
83+
</entity>
84+
</entities>

‎app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckConfigsChangesIsNotAffectedStartedCheckoutProcessTest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<createData entity="SimpleProduct2" stepKey="createProduct"/>
2424

2525
<!-- Enable free shipping method -->
26-
<createData entity="FreeShippingMethodsSettingConfig" stepKey="freeShippingMethodsSettingConfig"/>
26+
<magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
2727

2828
<!-- Disable flat rate method -->
29-
<createData entity="DisableFlatRateShippingMethodConfig" stepKey="disableFlatRate"/>
29+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3030
</before>
3131
<after>
3232
<!-- Roll back configuration -->
33-
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
34-
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>
33+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
34+
<magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
3535

3636
<!-- Delete simple product -->
3737
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
<testCaseId value="MC-14715"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
24-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2522
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2623
<!--Create simple product-->
2724
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
<testCaseId value="MC-14719"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
2421
<magentoCLI stepKey="disableShoppingCartSidebar" command="config:set checkout/sidebar/display 0"/>
25-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
22+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2623
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2724

2825
<!--Create simple products-->

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddConfigurableProductToShoppingCartTest.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
<testCaseId value="MC-14716"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2422
<!-- Create Default Category -->
2523
<createData entity="_defaultCategory" stepKey="createCategory"/>
2624

@@ -112,9 +110,9 @@
112110
<magentoCLI command="cache:flush" stepKey="flushCache"/>
113111
</before>
114112
<after>
115-
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
116-
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteSimpleProduct2"/>
117-
<deleteData createDataKey="createConfigChildProduct3" stepKey="deleteSimpleProduct3"/>
113+
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteSimpleProduct1"/>
114+
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteSimpleProduct2"/>
115+
<deleteData createDataKey="createConfigChildProduct3" stepKey="deleteSimpleProduct3"/>
118116
<deleteData createDataKey="createConfigProduct" stepKey="deleteProduct"/>
119117
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
120118
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddDownloadableProductToShoppingCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</annotations>
1919

2020
<before>
21-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2222
<createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
2323
<createData entity="downloadableLink1" stepKey="addDownloadableLink1">
2424
<requiredEntity createDataKey="createDownloadableProduct"/>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddGroupedProductToShoppingCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</annotations>
1919

2020
<before>
21-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2222
<!--Create Grouped product with three simple product -->
2323
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2">
2424
<field key="price">100.00</field>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddOneBundleMultiSelectOptionToTheShoppingCartTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</annotations>
1919

2020
<before>
21-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2222
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2323
<!--Create simple product-->
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddTwoBundleMultiSelectOptionsToTheShoppingCartTest.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515
<testCaseId value="MC-14728"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>
24-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2522
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2623
<!--Create simple product-->
2724
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckCartAndSummaryBlockItemDisplayWithDefaultDisplayLimitationTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</annotations>
1919

2020
<before>
21-
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2222
<!--Create simple product-->
2323
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
2424
<field key="price">10.00</field>

0 commit comments

Comments
 (0)