Skip to content

Commit d737f83

Browse files
ysapigaysapiga
committed
Merge branch 'MQE-2540' into 2.4-develop-sidecar-pr17
2 parents 10b6b04 + 3e93a6d commit d737f83

File tree

7 files changed

+616
-1864
lines changed

7 files changed

+616
-1864
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,4 +1397,20 @@
13971397
<requiredEntity type="product_option">ProductOptionField</requiredEntity>
13981398
<requiredEntity type="product_option">ProductOptionField2</requiredEntity>
13991399
</entity>
1400+
<entity name="SimpleProductWithCustomSku24MB01" type="product" extends="SimpleProduct2">
1401+
<data key="name" unique="suffix">ProductWithSku24MB01-</data>
1402+
<data key="sku" unique="suffix">24 MB01</data>
1403+
</entity>
1404+
<entity name="SimpleProductWithCustomSku24MB02" type="product" extends="SimpleProduct2">
1405+
<data key="name" unique="suffix">ProductWithSku24MB02-</data>
1406+
<data key="sku" unique="suffix">24 MB02 </data>
1407+
</entity>
1408+
<entity name="SimpleProductWithCustomSku24MB04" type="product" extends="SimpleProduct2">
1409+
<data key="name" unique="suffix">ProductWithSku24MB04-</data>
1410+
<data key="sku" unique="suffix">24 MB04 </data>
1411+
</entity>
1412+
<entity name="SimpleProductWithCustomSku24MB06" type="product" extends="SimpleProduct2">
1413+
<data key="name" unique="suffix">ProductWithSku24MB06-</data>
1414+
<data key="sku" unique="suffix">24 MB06 </data>
1415+
</entity>
14001416
</entities>

‎app/code/Magento/Elasticsearch7/Test/Mftf/Test/StorefrontQuickSearchUsingElasticSearchByProductSkuTest.xml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
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="StorefrontQuickSearchUsingElasticSearchByProductSkuTest">
12+
<annotations>
13+
<features value="Elasticsearch7"/>
14+
<stories value="Storefront Search"/>
15+
<title value="Check that AND query is performed when searching using ElasticSearch 7"/>
16+
<description value="Check that AND query is performed when searching using ElasticSearch 7"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-31114"/>
19+
<useCaseId value="MC-29788"/>
20+
<group value="SearchEngineElasticsearch"/>
21+
</annotations>
22+
<before>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
24+
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProducts"/>
25+
26+
<createData entity="VirtualProduct" stepKey="createFirtsSimpleProduct"/>
27+
<createData entity="SimpleProductWithCustomSku24MB06" stepKey="createSecondSimpleProduct"/>
28+
<createData entity="SimpleProductWithCustomSku24MB04" stepKey="createThirdSimpleProduct"/>
29+
<createData entity="SimpleProductWithCustomSku24MB02" stepKey="createFourthSimpleProduct"/>
30+
<createData entity="SimpleProductWithCustomSku24MB01" stepKey="createFifthSimpleProduct"/>
31+
32+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
33+
<argument name="tags" value=""/>
34+
</actionGroup>
35+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
36+
<argument name="indices" value=""/>
37+
</actionGroup>
38+
</before>
39+
<after>
40+
<deleteData createDataKey="createFirtsSimpleProduct" stepKey="deleteProductOne"/>
41+
42+
<actionGroup ref="DeleteAllProductsUsingProductGridActionGroup" stepKey="deleteAllProductsAfterTest"/>
43+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminPanel"/>
44+
</after>
45+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
46+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductSku">
47+
<argument name="phrase" value="24 MB04"/>
48+
</actionGroup>
49+
50+
<see userInput="4" selector="{{StorefrontCatalogSearchMainSection.productCount}}" stepKey="assertSearchResultCount"/>
51+
52+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertSecondProductName">
53+
<argument name="productName" value="$createSecondSimpleProduct.name$"/>
54+
</actionGroup>
55+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertThirdProductName">
56+
<argument name="productName" value="$createThirdSimpleProduct.name$"/>
57+
</actionGroup>
58+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertFourthProductName">
59+
<argument name="productName" value="$createFourthSimpleProduct.name$"/>
60+
</actionGroup>
61+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertFifthProductName">
62+
<argument name="productName" value="$createFifthSimpleProduct.name$"/>
63+
</actionGroup>
64+
</test>
65+
</tests>

0 commit comments

Comments
 (0)