Skip to content

Commit 482655a

Browse files
committed
ACP2E-1674: revert flat rate to default settings
1 parent 85c0979 commit 482655a

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithZeroSubtotalCheckoutTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createSalesRule"/>
4242
</before>
4343
<after>
44+
<!-- Set flat rate to default value -->
45+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
46+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
4447
<!-- Disable Free Shipping -->
4548
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
4649
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>

app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@
8888

8989
</before>
9090
<after>
91+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
92+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
9193
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
9294
<deleteData createDataKey="createProduct01" stepKey="deleteProduct1"/>
9395
<deleteData createDataKey="createProduct02" stepKey="deleteProduct2"/>

0 commit comments

Comments
 (0)