Skip to content

Commit 54d1823

Browse files
committed
AC-6080: Fixed the MFTF test fail
1 parent a1f2067 commit 54d1823

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
</annotations>
2121

2222
<before>
23+
<!--Enable flat rate shipping-->
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2325
<!-- Enable Zero Subtotal Checkout -->
2426
<magentoCLI command="config:set {{EnableZeroSubtotalCheckoutConfigData.path}} {{EnableZeroSubtotalCheckoutConfigData.value}}" stepKey="enableZeroSubtotalCheckout"/>
2527
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -39,6 +41,8 @@
3941
<createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createSalesRule"/>
4042
</before>
4143
<after>
44+
<!-- Disable shipping method for customer with default address -->
45+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
4246
<!-- Disable Free Shipping -->
4347
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
4448
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717
<group value="sales"/>
1818
</annotations>
1919
<before>
20+
<!--Enable flat rate shipping-->
21+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2022
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2123
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
2224
<requiredEntity createDataKey="createCategory"/>
23-
</createData>
25+
</createData>
2426
<createData entity="GuestCart" stepKey="createGuestCart"/>
2527
<createData entity="SimpleCartItem" stepKey="addCartItem">
2628
<requiredEntity createDataKey="createGuestCart"/>
@@ -35,6 +37,8 @@
3537
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
3638
</before>
3739
<after>
40+
<!-- Disable shipping method for customer with default address -->
41+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3842
<actionGroup ref="AdminLogoutActionGroup" stepKey="LogoutAsAdmin"/>
3943
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
4044
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>

app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontCartPriceRulePostcodeTest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
</annotations>
2121

2222
<before>
23+
<!--Enable flat rate shipping-->
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2325
<createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
2426
<createData entity="_defaultProduct" stepKey="createPreReqProduct">
2527
<requiredEntity createDataKey="createPreReqCategory"/>
@@ -28,6 +30,8 @@
2830
</before>
2931

3032
<after>
33+
<!-- Disable shipping method for customer with default address -->
34+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3135
<actionGroup ref="DeleteCartPriceRuleByName" stepKey="cleanUpRule">
3236
<argument name="ruleName" value="{{SimpleSalesRule.name}}"/>
3337
</actionGroup>

0 commit comments

Comments
 (0)