Skip to content

Commit 50bfba7

Browse files
omiroshnichenkoomiroshnichenko
committed
Merge branch 'MC-20182' of github.com:magento-arcticfoxes/magento2ce into MC-19451
2 parents 9360d2a + a24ebcf commit 50bfba7

19 files changed

+528
-1
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,20 @@
5555
<data key="attribute_code">is_anchor</data>
5656
<data key="value">0</data>
5757
</entity>
58+
<entity name="ProductDescriptionAdvancedSearchABC" type="custom_attribute">
59+
<data key="attribute_code">description</data>
60+
<data key="value">&lt;p&gt;adc_Full&lt;/p&gt;</data>
61+
</entity>
62+
<entity name="ProductShortDescriptionAdvancedSearch" type="custom_attribute">
63+
<data key="attribute_code">short_description</data>
64+
<data key="value">&lt;p&gt;abc_short&lt;/p&gt;</data>
65+
</entity>
66+
<entity name="ProductDescriptionAdvancedSearchADC123" type="custom_attribute">
67+
<data key="attribute_code">description</data>
68+
<data key="value">&lt;p&gt;dfj_full&lt;/p&gt;</data>
69+
</entity>
70+
<entity name="ProductShortDescriptionAdvancedSearchADC123" type="custom_attribute">
71+
<data key="attribute_code">short_description</data>
72+
<data key="value">&lt;p&gt;dfj_short&lt;/p&gt;</data>
73+
</entity>
5874
</entities>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1266,4 +1266,32 @@
12661266
<requiredEntity type="product_extension_attribute">EavStock1</requiredEntity>
12671267
<requiredEntity type="custom_attribute">CustomAttributeProductAttribute</requiredEntity>
12681268
</entity>
1269+
<entity name="ABC_dfj_SimpleProduct" type="product">
1270+
<data key="name" unique="suffix">abc_dfj_</data>
1271+
<data key="sku" unique="suffix">abc_dfj</data>
1272+
<data key="price">50.00</data>
1273+
<data key="type_id">simple</data>
1274+
<data key="attribute_set_id">4</data>
1275+
<data key="visibility">4</data>
1276+
<data key="status">1</data>
1277+
<data key="quantity">100</data>
1278+
<data key="weight">1</data>
1279+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
1280+
<requiredEntity type="custom_attribute_array">ProductDescriptionAdvancedSearchABC</requiredEntity>
1281+
<requiredEntity type="custom_attribute_array">ProductShortDescriptionAdvancedSearch</requiredEntity>
1282+
</entity>
1283+
<entity name="ABC_123_SimpleProduct" type="product">
1284+
<data key="name" unique="suffix">adc_123_</data>
1285+
<data key="sku" unique="suffix">adc_123</data>
1286+
<data key="price">100.00</data>
1287+
<data key="type_id">simple</data>
1288+
<data key="attribute_set_id">4</data>
1289+
<data key="visibility">4</data>
1290+
<data key="status">1</data>
1291+
<data key="quantity">100</data>
1292+
<data key="weight">1</data>
1293+
<requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
1294+
<requiredEntity type="custom_attribute_array">ProductDescriptionAdvancedSearchADC123</requiredEntity>
1295+
<requiredEntity type="custom_attribute_array">ProductShortDescriptionAdvancedSearchADC123</requiredEntity>
1296+
</entity>
12691297
</entities>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="StorefrontFillFormAdvancedSearchActionGroup">
12+
<arguments>
13+
<argument name="productName" type="string" defaultValue=""/>
14+
<argument name="sku" type="string" defaultValue=""/>
15+
<argument name="description" type="string" defaultValue=""/>
16+
<argument name="short_description" type="string" defaultValue=""/>
17+
<argument name="price_from" type="string" defaultValue=""/>
18+
<argument name="price_to" type="string" defaultValue=""/>
19+
</arguments>
20+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ProductName}}" userInput="{{productName}}" stepKey="fillName"/>
21+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.SKU}}" userInput="{{sku}}" stepKey="fillSku"/>
22+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.Description}}" userInput="{{description}}" stepKey="fillDescription"/>
23+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.ShortDescription}}" userInput="{{short_description}}" stepKey="fillShortDescription"/>
24+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceFrom}}" userInput="{{price_from}}" stepKey="fillPriceFrom"/>
25+
<fillField selector="{{StorefrontCatalogSearchAdvancedFormSection.PriceTo}}" userInput="{{price_to}}" stepKey="fillPriceTo"/>
26+
<click selector="{{StorefrontCatalogSearchAdvancedFormSection.SubmitButton}}" stepKey="clickSubmit"/>
27+
<waitForPageLoad stepKey="waitForPageLoad"/>
28+
</actionGroup>
29+
</actionGroups>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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="StorefrontAdvancedSearchByAllParametersTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by name, sku, description, short description, price from and price to"/>
15+
<description value="Search product in advanced search by name, sku, description, short description, price from and price to"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
22+
<argument name="productName" value="$$createProduct.name$$"/>
23+
<argument name="sku" value="abc_dfj"/>
24+
<argument name="description" value="adc_Full"/>
25+
<argument name="short_description" value="abc_short"/>
26+
<argument name="price_to" value="500"/>
27+
<argument name="price_from" value="49"/>
28+
</actionGroup>
29+
</test>
30+
</tests>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="StorefrontAdvancedSearchByDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by description"/>
15+
<description value="Search product in advanced search by description"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<createData entity="ABC_123_SimpleProduct" stepKey="createProduct"/>
23+
</before>
24+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
25+
<argument name="description" value="dfj_full"/>
26+
</actionGroup>
27+
</test>
28+
</tests>

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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="StorefrontAdvancedSearchByNameSkuDescriptionPriceTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by name, sku, description, short description, price from 49 and price to 50"/>
15+
<description value="Search product in advanced search by name, sku, description, short description, price from 49 and price to 50"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
22+
<argument name="productName" value="$$createProduct.name$$"/>
23+
<argument name="sku" value="abc_dfj"/>
24+
<argument name="description" value="adc_Full"/>
25+
<argument name="short_description" value="abc_short"/>
26+
<argument name="price_to" value="50"/>
27+
<argument name="price_from" value="49"/>
28+
</actionGroup>
29+
</test>
30+
</tests>

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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="StorefrontAdvancedSearchByNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by name"/>
15+
<description value="Search product in advanced search by name"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<before>
22+
<createData entity="ABC_123_SimpleProduct" stepKey="createProduct"/>
23+
</before>
24+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
25+
<argument name="productName" value="$$createProduct.name$$"/>
26+
</actionGroup>
27+
</test>
28+
</tests>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="StorefrontAdvancedSearchByPartialNameTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by partial name"/>
15+
<description value="Search product in advanced search by partial name"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
<group value="SearchEngineMysql"/>
21+
</annotations>
22+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
23+
<argument name="productName" value="abc"/>
24+
</actionGroup>
25+
</test>
26+
</tests>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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="StorefrontAdvancedSearchByPartialShortDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by partial short description"/>
15+
<description value="Search product in advanced search by partial short description"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
22+
<argument name="short_description" value="abc_short"/>
23+
</actionGroup>
24+
</test>
25+
</tests>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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="StorefrontAdvancedSearchByPartialSkuAndDescriptionTest" extends="StorefrontAdvancedSearchEntitySimpleProductTest">
12+
<annotations>
13+
<stories value="Use Advanced Search"/>
14+
<title value="Search product in advanced search by partial sku and description"/>
15+
<description value="Search product in advanced search by partial sku and description"/>
16+
<testCaseId value="MAGETWO-24729"/>
17+
<severity value="CRITICAL"/>
18+
<group value="searchFrontend"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="search">
22+
<argument name="sku" value="abc"/>
23+
<argument name="description" value="adc_full"/>
24+
</actionGroup>
25+
</test>
26+
</tests>

0 commit comments

Comments
 (0)