Skip to content

Commit f35a38a

Browse files
author
Oleksandr Gorkun
committed
Merge branch '2.2.7-develop' of https://github.com/magento/magento2ce into MAGETWO-92184-new
2 parents 72a1850 + a2afbc3 commit f35a38a

File tree

167 files changed

+2651
-5336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+2651
-5336
lines changed

app/code/Magento/AdminNotification/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/AdvancedPricingImportExport/Test/Mftf/composer.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

app/code/Magento/Analytics/Test/Mftf/composer.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

app/code/Magento/Authorization/Test/Mftf/composer.json

Lines changed: 0 additions & 17 deletions
This file was deleted.

app/code/Magento/Authorizenet/Test/Mftf/composer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

app/code/Magento/Backend/Test/Mftf/composer.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/code/Magento/Backup/Test/Mftf/composer.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/code/Magento/Braintree/Test/Mftf/composer.json

Lines changed: 0 additions & 33 deletions
This file was deleted.

app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="ApiBundleLink" type="bundle_link">
12-
<var key="sku" entityKey="sku" entityType="product2"/>
1312
<var key="option_id" entityKey="return" entityType="bundle_option"/>
1413
<var key="sku" entityKey="sku" entityType="product"/>
1514
<data key="qty">1</data>

app/code/Magento/Bundle/Test/Mftf/Data/BundleProductData.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<data key="urlKey" unique="suffix">bundleproduct</data>
2121
<data key="visibility">4</data>
2222
<data key="option_title" unique="suffix">TestOption</data>
23-
<data key="input_type" >Drop-down</data>
2423
<data key="default_quantity1" >10</data>
2524
<data key="default_quantity2" >20</data>
2625
<data key="input_type" >Drop-down</data>

0 commit comments

Comments
 (0)