Merge remote-tracking branch 'origin/MC-17606' into 2.3-develop-pr67

Author: zakdma

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

@@ -21,6 +21,7 @@
             <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRatePrice"/>
             <magentoCLI command="config:set {{EnableFlatRateToAllAllowedCountriesConfigData.path}} {{EnableFlatRateToAllAllowedCountriesConfigData.value}}" stepKey="allowFlatRateToAllCountries"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
 
             <!-- Create Default Category -->
             <createData entity="_defaultCategory" stepKey="createCategory"/>

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckingWithMultishipmentTest.xml

@@ -57,6 +57,7 @@
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
     </test>

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontCheckingWithSingleShipmentTest.xml

@@ -57,6 +57,7 @@
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
     </test>

app/code/Magento/Multishipping/Test/Mftf/Test/StoreFrontMinicartWithMultishipmentTest.xml

@@ -37,6 +37,16 @@
             </actionGroup>
         </before>
 
+        <after>
+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <createData entity="FreeShippinMethodDefault" stepKey="disableFreeShipping"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
+            <actionGroup ref="logout" stepKey="logoutAdmin"/>
+        </after>
+
         <amOnPage url="$$product1.name$$.html" stepKey="goToProduct1"/>
         <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProduct1">
             <argument name="productName" value="$$product1.name$$"/>
@@ -53,13 +63,5 @@
         <amOnPage url="/checkout/cart/index/" stepKey="amOnCheckoutCartIndexPage"/>
         <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCartAgain"/>
         <actionGroup ref="CheckingWithMinicartActionGroup" stepKey="checkoutWithMinicart"/>
-
-        <after>
-            <deleteData stepKey="deleteCategory" createDataKey="category"/>
-            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
-            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
-            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-            <actionGroup ref="logout" stepKey="logout"/>
-        </after>
     </test>
 </tests>