Skip to content

Commit 74e87da

Browse files
committed
AC-6080: Sync PR between 2.4.5-develop and 2.4-develop
1 parent 54d1823 commit 74e87da

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

app/code/Magento/Customer/Test/Mftf/Test/AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88

9-
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="AdminPanelIsFrozenIfStorefrontIsOpenedViaCustomerViewTest">
1212
<annotations>
@@ -19,6 +19,8 @@
1919
<group value="customer"/>
2020
</annotations>
2121
<before>
22+
<!--Enable flat rate shipping-->
23+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2224
<createData entity="Simple_US_Customer" stepKey="simpleCustomer"/>
2325
<createData entity="SimpleSubCategory" stepKey="createSimpleCategory"/>
2426
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
@@ -27,6 +29,8 @@
2729
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="login"/>
2830
</before>
2931
<after>
32+
<!-- Disable shipping method for customer with default address -->
33+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3034
<deleteData createDataKey="createSimpleCategory" stepKey="deleteCategory"/>
3135
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
3236
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<group value="sales"/>
1919
</annotations>
2020
<before>
21+
<!--Enable flat rate shipping-->
22+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2123
<actionGroup ref="EnableAdminAccountSharingActionGroup" stepKey="enableAdminAccountSharing"/>
2224
<createData entity="EnabledMinimumOrderAmount500" stepKey="enableMinimumOrderAmount"/>
2325
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
@@ -28,6 +30,8 @@
2830
<actionGroup ref="ClearCacheActionGroup" stepKey="clearCacheBefore"/>
2931
</before>
3032
<after>
33+
<!-- Disable shipping method for customer with default address -->
34+
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
3135
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3236
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3337
<createData entity="DisabledMinimumOrderAmount" stepKey="disableMinimumOrderAmount"/>

0 commit comments

Comments
 (0)