Skip to content

Commit d61cfc0

Browse files
DianaRusinDianaRusin
committed
MAGETWO-73989: [GitHub] Minimal Query Length For Catalog Search #6681 
1 parent d680498 commit d61cfc0

File tree

9 files changed

+42
-25
lines changed

9 files changed

+42
-25
lines changed

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,5 @@
2323
<element name="categoryPageProductImage" type="text" selector=".products-grid img[src*='/{{var1}}']" parameterized="true"/>
2424
<element name="categoryPageProductName" type="text" selector=".products.list.items.product-items li:nth-of-type({{line}}) .product-item-link" timeout="30" parameterized="true"/>
2525
<element name="categoryEmptyMessage" type="text" selector=".column.main .message.info.empty"/>
26-
<element name="productNameInGrid" type="text" selector="//div[contains(@class,'products-grid')]//strong[contains(@class,'product-item-name')]//a[normalize-space(text())='{{var}}']" parameterized="true"/>
2726
</section>
2827
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryProductSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
<element name="productPriceOld" type="text" selector="//span[@data-price-type='oldPrice']//span[@class='price'][contains(., '{{var1}}')]" parameterized="true"/>
2525
<element name="productPriceLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]" parameterized="true"/>
2626
<element name="productPriceLinkAfterLabel" type="text" selector="//span[@class='price-label'][contains(text(),'{{var1}}')]/following::span[contains(text(), '{{var2}}')]" parameterized="true"/>
27+
<element name="productNameInGrid" type="text" selector="//div[contains(@class,'products-grid')]//strong[contains(@class,'product-item-name')]//a[normalize-space(text())='{{product_name}}']" parameterized="true"/>
2728
</section>
2829
</sections>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontSearchProductActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<arguments>
1313
<argument name="product"/>
1414
</arguments>
15-
<see selector="{{StorefrontCategoryMainSection.productNameInGrid(product.name)}}" userInput="{{product.name}}" after="clickSearchButton" stepKey="seeProductNameInCatalogSearchPage"/>
15+
<waitForElementVisible selector="{{StorefrontCategoryProductSection.productNameInGrid(product.name)}}" after="clickSearchButton" stepKey="waitForProductNameElement"/>
16+
<seeElement selector="{{StorefrontCategoryProductSection.productNameInGrid(product.name)}}" stepKey="seeProductNameInCatalogSearchPage"/>
1617
</actionGroup>
1718
</actionGroups>

‎app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchConstData.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="MinMaxQueryLength" type="constant">
12+
<data key="hint">This value must be compatible with the corresponding setting in the configured search engine</data>
13+
</entity>
14+
</entities>

‎app/code/Magento/CatalogSearch/Test/Mftf/Data/CatalogSearchData.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="SetMinQueryLengthToDefault" type="catalog_search_config">
12-
<requiredEntity type="length_config">DefaultMinQueryLength</requiredEntity>
12+
<requiredEntity type="length_config">CheckUseSystemValueCheckbox</requiredEntity>
1313
</entity>
14-
<entity name="SetMinQueryLength" type="catalog_search_config">
15-
<requiredEntity type="length_config">SetMinQueryLengthToOne</requiredEntity>
14+
<entity name="SetMinQueryLengthToOne" type="catalog_search_config">
15+
<requiredEntity type="length_config">MinQueryLengthValue1</requiredEntity>
1616
</entity>
17-
<entity name="SetMinQueryLength2" type="catalog_search_config">
18-
<requiredEntity type="length_config">SetMinQueryLengthToTwo</requiredEntity>
17+
<entity name="SetMinQueryLengthToTwo" type="catalog_search_config">
18+
<requiredEntity type="length_config">MinQueryLengthValue2</requiredEntity>
1919
</entity>
2020

21-
<entity name="SetMinQueryLengthToOne" type="length_config">
21+
<entity name="MinQueryLengthValue1" type="length_config">
2222
<data key="value">1</data>
23-
<data key="inherit">false</data>
23+
<requiredEntity type="length_config_inherit">UncheckUseSystemValueCheckbox</requiredEntity>
2424
</entity>
25-
<entity name="SetMinQueryLengthToTwo" type="length_config">
25+
<entity name="MinQueryLengthValue2" type="length_config">
2626
<data key="value">2</data>
27-
<data key="inherit">false</data>
28-
</entity>
29-
<entity name="DefaultMinQueryLength" type="length_config">
30-
<data key="inherit">true</data>
27+
<requiredEntity type="length_config_inherit">UncheckUseSystemValueCheckbox</requiredEntity>
3128
</entity>
3229

33-
<entity name="MinMaxQueryLength" type="constant">
34-
<data key="hint">This value must be compatible with the corresponding setting in the configured search engine</data>
30+
<entity name="UncheckUseSystemValueCheckbox" type="length_config_inherit">
31+
<data key="value">false</data>
32+
</entity>
33+
<entity name="CheckUseSystemValueCheckbox" type="length_config_inherit">
34+
<data key="inherit">true</data>
3535
</entity>
3636
</entities>

‎app/code/Magento/CatalogSearch/Test/Mftf/Metadata/catalog_search-meta.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
<object key="search" dataType="catalog_search_config">
1313
<object key="fields" dataType="catalog_search_config">
1414
<object key="min_query_length" dataType="length_config">
15-
<field key="inherit">boolean</field>
15+
<object key="inherit" dataType="length_config_inherit">
16+
<field key="value">boolean</field>
17+
</object>
1618
<field key="value">integer</field>
1719
</object>
1820
</object>

‎app/code/Magento/Config/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml renamed to ‎app/code/Magento/CatalogSearch/Test/Mftf/Page/AdminCatalogSearchConfigurationPage.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
-->
88
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
9-
<page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/{{tab_anchor}}" area="admin" module="Magento_Config" parameterized="true">
9+
<page name="AdminCatalogSearchConfigurationPage" url="admin/system_config/edit/section/catalog/{{tab_anchor}}" area="admin" module="Magento_CatalogSearch" parameterized="true">
1010
<section name="AdminCatalogSearchConfigurationSection"/>
1111
</page>
1212
</pages>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
<severity value="AVERAGE"/>
1818
<testCaseId value="MC-15905"/>
1919
<useCaseId value="MAGETWO-73989"/>
20-
<group value="CatalogSearch"/>
20+
<group value="catalogSearch"/>
2121
</annotations>
2222
<before>
2323
<createData entity="_defaultCategory" stepKey="createCategory"/>
2424
<createData entity="ApiSimpleProduct" stepKey="createProduct">
2525
<requiredEntity createDataKey="createCategory"/>
2626
</createData>
27-
<createData entity="SetMinQueryLength" stepKey="setMinQueryLength"/>
27+
<createData entity="SetMinQueryLengthToOne" stepKey="setMinQueryLengthToOne"/>
2828
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2929
</before>
3030
<after>
@@ -36,12 +36,12 @@
3636
<actionGroup ref="AdminAssertQueryLengthHintsActionGroup" stepKey="assertQueryLengthHints"/>
3737
<actionGroup ref="StorefrontSearchProductActionGroup" stepKey="searchForProducts">
3838
<argument name="product" value="$$createProduct$$"/>
39-
<argument name="textForSearch" value="s"/>
39+
<argument name="searchPhrase" value="s"/>
4040
</actionGroup>
41-
<createData entity="SetMinQueryLength2" stepKey="setMinQueryLengthToTwo"/>
41+
<createData entity="SetMinQueryLengthToTwo" stepKey="setMinQueryLengthToTwo"/>
4242
<actionGroup ref="StorefrontSearchProductActionGroup" stepKey="searchForProductsAgain">
4343
<argument name="product" value="$$createProduct$$"/>
44-
<argument name="textForSearch" value="si"/>
44+
<argument name="searchPhrase" value="si"/>
4545
</actionGroup>
4646
</test>
4747
</tests>

‎app/code/Magento/Search/Test/Mftf/ActionGroup/StorefrontQuickSearchActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="StorefrontQuickSearchActionGroup">
1212
<arguments>
13-
<argument name="textForSearch" type="string"/>
13+
<argument name="searchPhrase" type="string"/>
1414
</arguments>
1515
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
16-
<fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="{{textForSearch}}" stepKey="fillSearchField"/>
16+
<fillField selector="{{StorefrontQuickSearchSection.searchPhrase}}" userInput="{{searchPhrase}}" stepKey="fillSearchField"/>
1717
<click selector="{{StorefrontQuickSearchSection.searchButton}}" stepKey="clickSearchButton"/>
1818
</actionGroup>
1919
</actionGroups>

0 commit comments

Comments
 (0)