Skip to content

Commit d89c264

Browse files
mkovdryshmkovdrysh
committed
MC-11971: Update Gift Wrapping for items
Fixed tests after resolved conflict
1 parent eac76c7 commit d89c264

11 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2626
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2727
<!--Create simple product-->
2828
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<before>
2121
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
22-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
22+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2323
<createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
2424
<createData entity="downloadableLink1" stepKey="addDownloadableLink1">
2525
<requiredEntity createDataKey="createDownloadableProduct"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2626
<!--Create Grouped product with three simple product -->
2727
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2">
2828
<field key="price">100.00</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2626
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2727
<!--Create simple product-->
2828
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2626
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2727
<!--Create simple product-->
2828
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<before>
2121
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
22-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
22+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2323
<!--Create simple product-->
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
2525
<field key="price">10.00</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<before>
2424
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
25+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2626
<!--Create simple product-->
2727
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
2828
<field key="price">10.00</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<before>
2121
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
22-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
22+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2323
<!--Create simple product-->
2424
<createData entity="SimpleProduct2" stepKey="simpleProduct1">
2525
<field key="price">10.00</field>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<before>
2222
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2323
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
24-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
24+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2525
<createData entity="SimpleSubCategory" stepKey="createSubCategory"/>
2626
<!--Create simple product-->
2727
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<before>
2222
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2323
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
24-
<magentoCLI command="config:set {{EnableFlatRateDefaultPrice.path}} {{EnableFlatRateDefaultPrice.value}}" stepKey="enableFlatRateDefaultPrice"/>
24+
<magentoCLI command="config:set {{EnableFlatRateDefaultPriceConfigData.path}} {{EnableFlatRateDefaultPriceConfigData.value}}" stepKey="enableFlatRateDefaultPrice"/>
2525
<createData entity="ApiDownloadableProduct" stepKey="createDownloadableProduct"/>
2626
<createData entity="downloadableLink1" stepKey="addDownloadableLink1">
2727
<requiredEntity createDataKey="createDownloadableProduct"/>

0 commit comments

Comments
 (0)