Skip to content

Commit f80bb04

Browse files
author
Prabhu Ram
committed
Merge branch 'MC-21228' of github.com:magento-honey-badgers/magento2ce into MC-21228
2 parents d29fe2f + 0f770a5 commit f80bb04

12 files changed

+100
-33
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-21228"/>-->
23+
<!-- </skip>-->
2424
</annotations>
2525
<before>
2626
<createData entity="ApiProductWithDescription" stepKey="simple1" before="simple2"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
3636
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
3737
</entity>
38+
<entity name="ApiSimpleProductWithNoSpace" type="product" extends="ApiSimpleProduct">
39+
<data key="name">TestFooBar</data>
40+
<data key="sku" unique="suffix">foobar</data>
41+
</entity>
3842
<entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
3943
<data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
4044
<data key="sku" unique="suffix">x&#38;trade;</data>
@@ -68,6 +72,9 @@
6872
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
6973
<requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
7074
</entity>
75+
<entity name="ProductForPartialSearch" extends="SimpleProduct" type="product">
76+
<data key="sku">partialTestSku</data>
77+
</entity>
7178
<entity name="ProductWithSpecialSymbols" extends="SimpleProduct" type="product">
7279
<data key="name">SimpleProduct -+~/\\&lt;&gt;\’“:*\$#@()!,.?`=%&amp;^</data>
7380
</entity>

‎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-21228"/>-->
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-21228"/>-->
23+
<!-- </skip>-->
2424
</annotations>
2525
<before>
2626
<createData entity="ApiVirtualProductWithDescription" stepKey="product"/>

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
<useCaseId value="MAGETWO-58764"/>
2020
<group value="CatalogSearch"/>
2121
<group value="SearchEngineElasticsearch"/>
22-
<skip>
23-
<issueId value="MC-21228"/>
24-
</skip>
22+
2523
</annotations>
2624
<before>
2725
<createData entity="ApiCategory" stepKey="createCategory"/>

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

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<group value="CatalogSearch"/>
1818
<group value="SearchEngineElasticsearch"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-21228"/>
22-
</skip>
20+
<!-- <skip>-->
21+
<!-- <issueId value="MC-21228"/>-->
22+
<!-- </skip>-->
2323
</annotations>
2424
<before>
2525
<createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -31,7 +31,6 @@
3131
</createData>
3232
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
3333

34-
3534
<!-- Create and Assign Attribute to product1-->
3635
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProduct1">
3736
<argument name="productId" value="$product1.id$"/>
@@ -79,18 +78,19 @@
7978
<deleteData stepKey="deleteProduct1" createDataKey="product1"/>
8079
<deleteData stepKey="deleteProduct2" createDataKey="product2"/>
8180
<deleteData stepKey="deleteCategory" createDataKey="createCategory"/>
81+
8282
</after>
8383
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToFrontPage"/>
8484
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="searchStorefront">
8585
<argument name="phrase" value="{{_defaultProduct.name}}"/>
8686
</actionGroup>
8787
<actionGroup ref="StorefrontQuickSearchCheckProductNameInGridActionGroup" stepKey="assertProduct1Position">
8888
<argument name="productName" value="$product1.name$"/>
89-
<argument name="index" value="2"/>
89+
<argument name="index" value="1"/>
9090
</actionGroup>
9191
<actionGroup ref="StorefrontQuickSearchCheckProductNameInGridActionGroup" stepKey="assertProduct2Position">
9292
<argument name="productName" value="$product2.name$"/>
93-
<argument name="index" value="1"/>
93+
<argument name="index" value="2"/>
9494
</actionGroup>
9595
</test>
9696
</tests>

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

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontPartialWordQuickSearchUsingElasticSearchTest">
12+
<annotations>
13+
<features value="Search"/>
14+
<stories value="Partial Word search using Elasticsearch"/>
15+
<title value="Support partial word search in Elasticsearch"/>
16+
<description value="Support quick search with Partial word search using ES"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-34205"/>
19+
<group value="SearchEngineElasticsearch" />
20+
</annotations>
21+
<before>
22+
<!-- Create subcategory -->
23+
<createData entity="SimpleSubCategory" stepKey="newCategory"/>
24+
<createData entity="ProductForPartialSearch" stepKey="product1">
25+
<requiredEntity createDataKey="newCategory"/>
26+
</createData>
27+
<createData entity="ApiSimpleProduct" stepKey="product2">
28+
<requiredEntity createDataKey="newCategory"/>
29+
</createData>
30+
<createData entity="ApiSimpleProductWithNoSpace" stepKey="product3">
31+
<requiredEntity createDataKey="newCategory"/>
32+
</createData>
33+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
34+
</before>
35+
<after>
36+
<deleteData createDataKey="product1" stepKey="deleteProduct1"/>
37+
<deleteData createDataKey="product2" stepKey="deleteProduct2"/>
38+
<deleteData createDataKey="product3" stepKey="deleteProduct3"/>
39+
<deleteData createDataKey="newCategory" stepKey="deleteCategory"/>
40+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
41+
</after>
42+
43+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
44+
45+
<!--Perform a quick seach using a partial word from product SKU-->
46+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchPartialSku">
47+
<argument name="phrase" value="partial"/>
48+
</actionGroup>
49+
50+
<!--Perform a case insensitive quick search of partial word using case product name -->
51+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchPartialCaseInSensitive">
52+
<argument name="phrase" value="simple"/>
53+
</actionGroup>
54+
<!--Perform a quick search using parts of the words from name/sku with additional characters-->
55+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchPartialWordsWithExtraChars">
56+
<argument name="phrase" value="barstool"/>
57+
</actionGroup>
58+
<actionGroup ref="StorefrontCheckSearchIsEmptyActionGroup" stepKey="checkEmptySearchResult"/>
59+
60+
</test>
61+
</tests>
62+

‎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-21228"/>-->
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)