Skip to content

Commit 0f56386

Browse files
dthampydthampy
committed
MC-21228: Support partial word search in Elasticsearch
- fixing tests and skip advanced search test with actual bug
1 parent af229f6 commit 0f56386

13 files changed

+32
-37
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<testCaseId value="MC-20359"/>
1919
<group value="Bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<!-- <skip>-->
22-
<!-- <issueId value="MC-21228"/>-->
23-
<!-- </skip>-->
21+
<skip>
22+
<issueId value="MC-34217"/>
23+
</skip>
2424
</annotations>
2525
<before>
2626
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchSimpleProductBySkuWithHyphenTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<testCaseId value="MC-20361"/>
1919
<group value="Catalog"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<!-- <skip>-->
22-
<!-- <issueId value="MC-21228"/>-->
23-
<!-- </skip>-->
21+
<skip>
22+
<issueId value="MC-34217"/>
23+
</skip>
2424
</annotations>
2525
<before>
2626
<createData entity="ApiProductWithDescription" stepKey="product"/>

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontAdvanceCatalogSearchVirtualProductBySkuWithHyphenTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<testCaseId value="MC-20385"/>
1919
<group value="Catalog"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<!-- <skip>-->
22-
<!-- <issueId value="MC-21228"/>-->
23-
<!-- </skip>-->
21+
<skip>
22+
<issueId value="MC-34217"/>
23+
</skip>
2424
</annotations>
2525
<before>
2626
<createData entity="ApiVirtualProductWithDescription" stepKey="product"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</annotations>
2424
<before>
2525
<createData entity="ApiCategory" stepKey="createCategory"/>
26-
<createData entity="ApiSimpleProduct" stepKey="createProduct">
26+
<createData entity="productAlphabeticalB" stepKey="createProduct">
2727
<requiredEntity createDataKey="createCategory"/>
2828
</createData>
2929
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -37,7 +37,8 @@
3737
<actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
3838
<comment userInput="Go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
3939
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
40-
<fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
40+
<comment userInput="Quick search by single character and avoid using ES stopwords" stepKey="commentQuickSearch"/>
41+
<fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="B" stepKey="fillAttribute"/>
4142
<waitForPageLoad stepKey="waitForSearchTextBox"/>
4243
<click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
4344
<waitForPageLoad stepKey="waitForSearch"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchProductByNameWithThreeLettersTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<group value="CatalogSearch"/>
1818
<group value="SearchEngineElasticsearch"/>
1919
<group value="mtf_migrated"/>
20-
<!-- <skip>-->
21-
<!-- <issueId value="MC-21228"/>-->
22-
<!-- </skip>-->
2320
</annotations>
2421
<executeJS function="var s = '$createSimpleProduct.name$'; var ret=s.substring(0,3); return ret;" stepKey="getFirstThreeLetters" before="searchStorefront"/>
2522
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/SearchEntityResultsTest/QuickSearchTwoProductsWithSameWeightTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<group value="CatalogSearch"/>
1818
<group value="SearchEngineElasticsearch"/>
1919
<group value="mtf_migrated"/>
20-
<!-- <skip>-->
21-
<!-- <issueId value="MC-21228"/>-->
22-
<!-- </skip>-->
2320
</annotations>
2421
<before>
2522
<createData entity="_defaultCategory" stepKey="createCategory"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontAdvancedSearchByPartialNameTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<group value="searchFrontend"/>
1919
<group value="mtf_migrated"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<skip>
22-
<issueId value="MC-21228"/>
23-
</skip>
21+
<!-- <skip>-->
22+
<!-- <issueId value="MC-21228"/>-->
23+
<!-- </skip>-->
2424
</annotations>
2525
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
2626
<argument name="productName" value="abc"/>

‎app/code/Magento/CatalogSearch/Test/Mftf/Test/StorefrontPartialWordQuickSearchUsingElasticSearchTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<description value="Support quick search with Partial word search using ES"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-34205"/>
19-
<group value="SearchEngineElasticsearch" />
19+
<group value="SearchEngineElasticsearch"/>
2020
</annotations>
2121
<before>
2222
<!-- Create subcategory -->

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontAdvanceCatalogSearchConfigurableBySkuWithHyphenTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<testCaseId value="MC-20389"/>
1919
<group value="ConfigurableProduct"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<!-- <skip>-->
22-
<!-- <issueId value="MC-21228"/>-->
23-
<!-- </skip>-->
21+
<skip>
22+
<issueId value="MC-34217"/>
23+
</skip>
2424
</annotations>
2525
<before>
2626
<createData entity="SimpleSubCategory" stepKey="categoryHandle" before="simple1Handle"/>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductChildSearchTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<testCaseId value="MC-249"/>
1919
<group value="ConfigurableProduct"/>
2020
<group value="SearchEngineElasticsearch"/>
21-
<!-- <skip>-->
22-
<!-- <issueId value="MC-21228"/>-->
23-
<!-- </skip>-->
21+
<skip>
22+
<issueId value="MC-21228"/>
23+
</skip>
2424
</annotations>
2525
<before>
2626
<!-- TODO: This should be converted to an actionGroup once MQE-993 is fixed. -->

0 commit comments

Comments
 (0)