Skip to content

Commit 8fa7af5

Browse files
author
Davit_Zakharyan
committed
MAGETWO-58764: [GitHub] Minimal Query Length For Catalog Search #6681
- Updated automated test script.
1 parent 93503f8 commit 8fa7af5

File tree

7 files changed

+81
-6
lines changed

7 files changed

+81
-6
lines changed

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml renamed to ‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AdminSetMinimalQueryLengthActionGroup.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<see userInput="{{MinMaxQueryLength.Hint}}" selector="{{AdminCatalogSearchConfigurationSection.maxQueryLengthHint}}" stepKey="seeHint2"/>
2222
<uncheckOption selector="{{AdminCatalogSearchConfigurationSection.minQueryLengthInherit}}" stepKey="uncheckSystemValue"/>
2323
<fillField selector="{{AdminCatalogSearchConfigurationSection.minQueryLength}}" userInput="{{minLength}}" stepKey="setMinQueryLength"/>
24+
<scrollTo selector="{{AdminConfigCatalogCategoryPermissionsSection.catalogPermissionsTab}}" stepKey="scrollToCatalogPermissionsTab"/>
2425
<click selector="{{AdminCatalogSearchConfigurationSection.catalogSearchTab}}" stepKey="collapseTab"/>
2526
<click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig"/>
2627
<waitForPageLoad stepKey="waitForConfigSaved"/>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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="SetMinQueryLengthToDefault" type="catalog_search_config_def">
12+
<requiredEntity type="enable">DefaultMinQueryLength</requiredEntity>
13+
</entity>
14+
<entity name="UncheckMinQueryLengthAndSet" type="catalog_search_config_query_length">
15+
<requiredEntity type="number">SetMinQueryLengthToOne</requiredEntity>
16+
</entity>
17+
<entity name="DefaultMinQueryLength" type="enable">
18+
<data key="inherit">true</data>
19+
</entity>
20+
<entity name="DefaultMinQueryLengthDisable" type="enable">
21+
<data key="inherit">0</data>
22+
</entity>
23+
<entity name="SetMinQueryLengthToOne" type="number">
24+
<data key="value">1</data>
25+
</entity>
26+
27+
</entities>

‎app/code/Magento/Config/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml renamed to ‎app/code/Magento/CatalogSearch/Test/Mftf/Data/MinMaxQueryLengthHintsData.xml

File renamed without changes.

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
10+
<operation name="CatalogSearchConfigDefault" dataType="catalog_search_config_def" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
11+
<object key="groups" dataType="catalog_search_config_def">
12+
<object key="search" dataType="catalog_search_config_def">
13+
<object key="fields" dataType="catalog_search_config_def">
14+
<object key="min_query_length" dataType="enable">
15+
<field key="inherit">boolean</field>
16+
</object>
17+
</object>
18+
</object>
19+
</object>
20+
</operation>
21+
<operation name="CatalogSearchConfigQueryLength" dataType="catalog_search_config_query_length" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
22+
<object key="groups" dataType="catalog_search_config_query_length">
23+
<object key="search" dataType="catalog_search_config_query_length">
24+
<object key="fields" dataType="catalog_search_config_query_length">
25+
<object key="min_query_length" dataType="number">
26+
<field key="value">integer</field>
27+
</object>
28+
</object>
29+
</object>
30+
</object>
31+
</operation>
32+
</operations>

‎app/code/Magento/CatalogSearch/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminCatalogSearchConfigurationSection">
12+
<element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
13+
<element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
14+
<element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
15+
<element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
16+
</section>
17+
</sections>

‎app/code/Magento/Search/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml renamed to ‎app/code/Magento/CatalogSearch/Test/Mftf/Test/MinimalQueryLengthForCatalogSearchTest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="MinimalQueryLengthForCatalogSearchTest">
1212
<annotations>
13-
<features value="Catalog"/>
13+
<features value="CatalogSearch"/>
1414
<title value="Minimal query length for catalog search"/>
1515
<description value="Minimal query length for catalog search"/>
1616
<severity value="AVERAGE"/>
1717
<testCaseId value="MC-6325"/>
1818
<useCaseId value="MAGETWO-58764"/>
19-
<group value="Catalog"/>
19+
<group value="CatalogSearch"/>
2020
</annotations>
2121
<before>
2222
<createData entity="ApiCategory" stepKey="createCategory"/>
@@ -28,9 +28,11 @@
2828
<after>
2929
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3030
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
31+
<createData entity="SetMinQueryLengthToDefault" stepKey="setMinimumQueryLengthToDefault"/>
3132
<actionGroup ref="logout" stepKey="logout"/>
3233
</after>
3334
<actionGroup ref="SetMinimalQueryLengthActionGroup" stepKey="setMinQueryLength"/>
35+
<comment userInput="go to Storefront and search for product" stepKey="searchProdUsingMinQueryLength"/>
3436
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToHomePage"/>
3537
<fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="s" stepKey="fillAttribute"/>
3638
<waitForPageLoad stepKey="waitForSearchTextBox"/>

‎app/code/Magento/Config/Test/Mftf/Section/CatalogSearchAdminConfigSection.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@
1111
<element name="checkIfCatalogSearchTabExpand" type="button" selector="#catalog_search-head:not(.open)"/>
1212
<element name="searchEngineDefaultSystemValue" type="checkbox" selector="#catalog_search_engine_inherit"/>
1313
<element name="searchEngine" type="select" selector="#catalog_search_engine"/>
14-
<element name="minQueryLength" type="input" selector="#catalog_search_min_query_length"/>
15-
<element name="minQueryLengthInherit" type="checkbox" selector="#catalog_search_min_query_length_inherit"/>
16-
<element name="minQueryLengthHint" type="text" selector="#row_catalog_search_min_query_length .value span"/>
17-
<element name="maxQueryLengthHint" type="text" selector="#row_catalog_search_max_query_length .value span"/>
1814
</section>
1915
</sections>

0 commit comments

Comments
 (0)