Skip to content

Commit 844427e

Browse files
committed
MC-13210: Register customer with image upload
Change files after resolved conflict
1 parent 79e48fe commit 844427e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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
@@ -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="SimpleSubCategory" stepKey="createSubCategory"/>
2424
<!--Create simple product-->
2525
<createData entity="SimpleProduct2" stepKey="simpleProduct1">

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>

0 commit comments

Comments
 (0)