Skip to content

Commit a2da77f

Browse files
alzotaalzota
committed
ACP2E-1674: revert flat rate to default settings
1 parent 0727043 commit a2da77f

23 files changed

+63
-58
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/EditOrderWithBundleProductBackendTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@
8383
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
8484
</before>
8585
<after>
86-
<!--Remove default flat rate shipping method settings-->
87-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
86+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
87+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
88+
8889
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
8990
<deleteData createDataKey="createCustomer2" stepKey="deleteCustomer2"/>
9091

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,23 @@
3333
</actionGroup>
3434
</before>
3535
<after>
36-
<!-- Disable shipping method for customer with default address -->
37-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
38-
<!--Logout from customer account-->
36+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
37+
<!-- set shipping as default -->
38+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
39+
<!--Logout from customer account -->
3940
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutStorefront"/>
4041
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
4142
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
4243
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
43-
<!-- set shipping as default -->
44-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
45-
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
46-
<conditionalClick selector="{{AdminShippingMethodFlatRateSection.carriersFlatRateTab}}" dependentSelector="{{AdminShippingMethodFlatRateSection.carriersFlatRateActive}}" visible="false" stepKey="expandFlatRateTab"/>
47-
<click selector="{{AdminShippingMethodFlatRateSection.carriersEnableFlatRateActive}}" stepKey="useDefaultValue"/>
48-
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfigs"/>
49-
<waitForPageLoad stepKey="waitForPageLoad"/>
50-
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the configuration." stepKey="seeSuccessMessage"/>
51-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
44+
45+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="loginAsAdmin"/>
46+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="openShippingMethodConfigPage"/>
47+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="expandFlatRateTab"/>
48+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="useDefaultValue"/>
49+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="saveConfigs"/>
50+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageLoad"/>
51+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="seeSuccessMessage"/>
52+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="logout"/>
5253
<!-- set shipping as default -->
5354
<comment userInput="BIC workaround" stepKey="logoutCustomer"/>
5455
</after>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<createData entity="Simple_US_Customer_US_UK_Addresses" stepKey="createCustomer"/>
3737
</before>
3838
<after>
39-
<!-- Disable shipping method for customer with default address -->
40-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
39+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
40+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
4141
<!--Disable Cash On Delivery method-->
4242
<actionGroup ref="CashOnDeliverySpecificCountryActionGroup" stepKey="disableCashOnDelivery"/>
4343
<!--Customer log out-->

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateActiveHtmlTermEntityTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
</before>
3030
<after>
3131
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
32-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
32+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
33+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
3334
<deleteData createDataKey="createProduct" stepKey="deletedProduct"/>
3435

3536
<actionGroup ref="AdminTermsConditionsOpenGridActionGroup" stepKey="openTermsGridToDelete"/>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminCreateEnabledTextTermOnMultishippingEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
3333
</before>
3434
<after>
35-
<!-- Disable shipping method for customer with default address -->
36-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
35+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
36+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
3737
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
3838

3939
<deleteData createDataKey="createdCustomer" stepKey="deletedCustomer"/>

‎app/code/Magento/CheckoutAgreements/Test/Mftf/Test/AdminDeleteActiveTextTermEntityTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<actionGroup ref="AdminTermsConditionsSaveTermActionGroup" stepKey="saveNewTerm"/>
3232
</before>
3333
<after>
34-
<!-- Disable shipping method for customer with default address -->
35-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
34+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
35+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
3636
<magentoCLI command="config:set checkout/options/enable_agreements 0" stepKey="setDisableTermsOnCheckout"/>
3737
<deleteData createDataKey="createdProduct" stepKey="deletedProduct"/>
3838
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="login"/>
3030
</before>
3131
<after>
32-
<!-- Disable shipping method for customer with default address -->
33-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
32+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
33+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
3434
<deleteData createDataKey="createSimpleCategory" stepKey="deleteCategory"/>
3535
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
3636
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCustomerAccountOrderListTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
</before>
107107

108108
<after>
109-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
109+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
110+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
110111
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
111112
<deleteData createDataKey="Product" stepKey="deleteProduct"/>
112113
<deleteData createDataKey="Customer" stepKey="deleteCustomer"/>

‎app/code/Magento/Reports/Test/Mftf/Test/AdminCanceledOrdersInOrderSalesReportTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
7575
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
7676
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
77-
<!-- Disable shipping method for customer with default address -->
78-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
77+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="disableFlatRate"/>
78+
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
7979
</after>
8080

8181
<actionGroup ref="AdminGoToOrdersReportPageActionGroup" stepKey="goToOrdersReportPage1"/>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
<createData entity="SalesRuleNoCouponWithFixedDiscount" stepKey="createSalesRule"/>
4242
</before>
4343
<after>
44-
<!-- Disable shipping method for customer with default address -->
45-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
4644
<!-- Disable Free Shipping -->
4745
<createData entity="DefaultShippingMethodsConfig" stepKey="defaultShippingMethodsConfig"/>
4846
<createData entity="DisableFreeShippingConfig" stepKey="disableFreeShippingConfig"/>

0 commit comments

Comments
 (0)