Skip to content

Commit c0539e9

Browse files
committed
Merge remote-tracking branch 'origin/MC-20539' into MC-33394-pr-delivery
2 parents 95ab73c + c732689 commit c0539e9

File tree

42 files changed

+44
-1612
lines changed

Some content is hidden

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

42 files changed

+44
-1612
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ atlassian*
1717
/app/config_sandbox
1818
/app/etc/config.php
1919
/app/etc/env.php
20+
/dev/tests/acceptance/tests/functional/Magento/_generated/*
2021
/app/code/Magento/TestModule*
2122
/lib/internal/flex/uploader/.actionScriptProperties
2223
/lib/internal/flex/uploader/.flexProperties

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByDescriptionMysqlTest.xml

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

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByNameMysqlTest.xml

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

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByPriceMysqlTest.xml

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

app/code/Magento/Bundle/Test/Mftf/Test/AdvanceCatalogSearchBundleByShortDescriptionMysqlTest.xml

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

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdvanceCatalogSearchBundleBySkuWithHyphenTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-20359"/>
1919
<group value="Bundle"/>
20-
<group value="SearchEngineMysql"/>
20+
<group value="SearchEngineElasticsearch"/>
2121
<skip>
22-
<issueId value="MC-20539"/>
22+
<issueId value="MC-21228"/>
2323
</skip>
2424
</annotations>
2525
<before>

app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesStoreViewScopeTest/AdminMassUpdateProductAttributesStoreViewScopeMysqlTest.xml

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

0 commit comments

Comments
 (0)