Skip to content

Commit 11a398d

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-34217' into 2.4-develop-pr131
2 parents bff13d9 + 1be5562 commit 11a398d

15 files changed

+182
-64
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<title value="Guest customer should be able to advance search Bundle product with product description"/>
1616
<description value="Guest customer should be able to advance search Bundle product with product description"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-242"/>
19-
<group value="Bundle"/>
18+
<testCaseId value="MC-25427"/>
19+
<group value="bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
@@ -43,9 +43,9 @@
4343
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
4444
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4545
</after>
46-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
49-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
46+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
49+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
5050
</test>
5151
</tests>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<title value="Guest customer should be able to advance search Bundle product with product price"/>
1616
<description value="Guest customer should be able to advance search Bundle product with product price"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-251"/>
19-
<group value="Bundle"/>
18+
<testCaseId value="MC-25435"/>
19+
<group value="bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
@@ -52,9 +52,9 @@
5252
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
5353
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
5454
</after>
55-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
56-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
57-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
58-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
55+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
56+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
57+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
58+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
5959
</test>
6060
</tests>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<title value="Guest customer should be able to advance search Bundle product with product short description"/>
1616
<description value="Guest customer should be able to advance search Bundle product with product short description"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-250"/>
19-
<group value="Bundle"/>
18+
<testCaseId value="MC-25434"/>
19+
<group value="bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
@@ -43,9 +43,9 @@
4343
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
4444
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4545
</after>
46-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
49-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
46+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
49+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
5050
</test>
5151
</tests>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<title value="Guest customer should be able to advance search Bundle product with product name"/>
1616
<description value="Guest customer should be able to advance search Bundle product with product name"/>
1717
<severity value="MAJOR"/>
18-
<testCaseId value="MC-139"/>
19-
<group value="Bundle"/>
18+
<testCaseId value="MC-25342"/>
19+
<group value="bundle"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
2222
<before>
@@ -43,9 +43,9 @@
4343
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
4444
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4545
</after>
46-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
49-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
46+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
47+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
48+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
49+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
5050
</test>
5151
</tests>

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<title value="Admin should be able to mass update product attributes in store view scope"/>
1515
<description value="Admin should be able to mass update product attributes in store view scope"/>
1616
<severity value="AVERAGE"/>
17-
<testCaseId value="MC-128"/>
18-
<group value="Catalog"/>
17+
<testCaseId value="MC-25333"/>
18+
<group value="catalog"/>
1919
<group value="Product Attributes"/>
2020
<group value="SearchEngineElasticsearch"/>
2121
</annotations>
@@ -51,35 +51,43 @@
5151
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
5252
<!-- Update attribute -->
5353
<click selector="{{AdminEditProductAttributesSection.ChangeAttributeDescriptionToggle}}" stepKey="toggleToChangeDescription"/>
54-
<fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $$createProductOne.custom_attributes[description]$$" stepKey="fillAttributeDescriptionField"/>
54+
<fillField selector="{{AdminEditProductAttributesSection.AttributeDescription}}" userInput="Updated $createProductOne.custom_attributes[description]$" stepKey="fillAttributeDescriptionField"/>
5555
<click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
5656
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="Message is added to queue" stepKey="seeAttributeUpateSuccessMsg"/>
5757

58+
<!-- Start message queue for product attribute consumer -->
59+
<actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
60+
<argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
61+
<argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
62+
</actionGroup>
5863

5964
<!-- Assert on storefront default view with partial word of product name -->
6065
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
6166
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault">
62-
<argument name="name" value="$$createProductOne.name$$"/>
63-
<argument name="description" value="$$createProductOne.custom_attributes[description]$$"/>
67+
<argument name="name" value="$createProductOne.name$"/>
68+
<argument name="description" value="$createProductOne.custom_attributes[description]$"/>
6469
</actionGroup>
6570
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
66-
<see userInput="2 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
71+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault"/>
6772

6873
<!-- Assert on storefront custom view with partial word of product name -->
6974
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
7075
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
7176
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameCustom">
72-
<argument name="name" value="$$createProductOne.name$$"/>
73-
<argument name="description" value="Updated $$createProductOne.custom_attributes[description]$$"/>
77+
<argument name="name" value="$createProductTwo.name$"/>
78+
<argument name="description" value="Updated $createProductOne.custom_attributes[description]$"/>
7479
</actionGroup>
7580
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
76-
<see userInput="2 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
81+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInCustom"/>
7782

7883
<!-- Assert Storefront default view with exact product name -->
7984
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault1"/>
85+
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
86+
<argument name="storeView" value="_defaultStore"/>
87+
</actionGroup>
8088
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndDescriptionActionGroup" stepKey="searchByNameDefault1">
81-
<argument name="name" value="$$createProductThree.name$$"/>
82-
<argument name="description" value="$$createProductThree.custom_attributes[description]$$"/>
89+
<argument name="name" value="$createProductThree.name$"/>
90+
<argument name="description" value="$createProductThree.custom_attributes[description]$"/>
8391
</actionGroup>
8492
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault1"/>
8593
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="seeInDefault1"/>

‎app/code/Magento/CatalogSearch/Model/Search/RequestGenerator.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ private function generateAdvancedSearchRequest()
186186
[
187187
'field' => $attribute->getAttributeCode(),
188188
'boost' => $attribute->getSearchWeight() ?: 1,
189+
'matchCondition' => 'match_phrase_prefix',
189190
],
190191
],
191192
];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<waitForLoadingMaskToDisappear stepKey="waitForSearchProductsloaded" after="searchClickAdvancedSearchSubmitButton"/>
2424
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="searchCheckAdvancedSearchResult" after="waitForSearchProductsloaded"/>
2525
<!-- Results returned will be different with ES vs MySQL -->
26-
<see userInput="4" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
26+
<see userInput="1" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.productCount}} span" stepKey="searchAdvancedAssertProductCount" after="searchCheckAdvancedSearchResult"/>
2727
<actionGroup ref="StorefrontCheckCategorySimpleProductActionGroup" stepKey="searchAssertSimpleProduct1" after="searchAdvancedAssertProductCount">
2828
<argument name="product" value="$$createSimpleProduct1$$"/>
2929
</actionGroup>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,15 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="StorefrontAdvancedSearchByPartialNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
1212
<annotations>
13+
<features value="CatalogSearch"/>
1314
<stories value="Use Advanced Search"/>
1415
<title value="Search product in advanced search by partial name"/>
1516
<description value="Search product in advanced search by partial name"/>
16-
<testCaseId value="MAGETWO-24729"/>
1717
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-40416"/>
1819
<group value="searchFrontend"/>
1920
<group value="mtf_migrated"/>
2021
<group value="SearchEngineElasticsearch"/>
21-
<skip>
22-
<issueId value="MC-34217"/>
23-
</skip>
2422
</annotations>
2523
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
2624
<argument name="productName" value="abc"/>

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByDescriptionTest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<title value="Guest customer should be able to advance search Grouped product with product description"/>
1515
<description value="Guest customer should be able to advance search Grouped product with product description"/>
1616
<severity value="MAJOR"/>
17-
<testCaseId value="MC-282"/>
18-
<group value="GroupedProduct"/>
17+
<testCaseId value="MC-25443"/>
18+
<group value="groupedProduct"/>
1919
<group value="SearchEngineElasticsearch"/>
2020
</annotations>
2121
<before>
@@ -39,9 +39,9 @@
3939
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
4040
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4141
</after>
42-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
43-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
44-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
45-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
42+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
43+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
44+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
45+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
4646
</test>
4747
</tests>

‎app/code/Magento/GroupedProduct/Test/Mftf/Test/AdvanceCatalogSearchGroupedProductTest/AdvanceCatalogSearchGroupedProductByNameTest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<title value="Guest customer should be able to advance search Grouped product with product name"/>
1515
<description value="Guest customer should be able to advance search Grouped product with product name"/>
1616
<severity value="MAJOR"/>
17-
<testCaseId value="MC-141"/>
18-
<group value="GroupedProduct"/>
17+
<testCaseId value="MC-25344"/>
18+
<group value="groupedProduct"/>
1919
<group value="SearchEngineElasticsearch"/>
2020
</annotations>
2121
<before>
@@ -39,9 +39,9 @@
3939
<deleteData createDataKey="simple1" stepKey="deleteSimple1" before="deleteSimple2"/>
4040
<deleteData createDataKey="simple2" stepKey="deleteSimple2" before="delete"/>
4141
</after>
42-
<see userInput="3 items" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
43-
<see userInput="$$product.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
44-
<see userInput="$$simple1.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('2')}}" stepKey="seeSimple1ProductName"/>
45-
<see userInput="$$simple2.name$$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('3')}}" stepKey="seeSimple2ProductName"/>
42+
<see userInput="1 item" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="see"/>
43+
<see userInput="$product.name$" selector="{{StorefrontCatalogSearchAdvancedResultMainSection.nthProductName('1')}}" stepKey="seeProductName"/>
44+
<comment userInput="BIC workaround" stepKey="seeSimple1ProductName"/>
45+
<comment userInput="BIC workaround" stepKey="seeSimple2ProductName"/>
4646
</test>
4747
</tests>

0 commit comments

Comments
 (0)