Skip to content

Commit 0528f37

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/MC-31464' into 2.3-develop-pr112
2 parents d04dae2 + 1865fae commit 0528f37

File tree

5 files changed

+218
-1
lines changed

5 files changed

+218
-1
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductIsPresentOnCategoryPageActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="AssertStorefrontProductIsPresentOnCategoryPageActionGroup">
12+
<annotations>
13+
<description>Validate that the provided Product is present and has correct name on a Category page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="productName" type="string" defaultValue="{{ApiSimpleOne.name}}"/>
17+
</arguments>
18+
19+
<waitForElementVisible selector="{{StorefrontCategoryProductSection.ProductTitleByName(productName)}}" stepKey="assertProductName"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
<actionGroup name="AssertProductOnCategoryPageActionGroup" extends="StorefrontCheckCategorySimpleProduct">
8282
<annotations>
83-
<description>EXTENDS:StorefrontCheckCategorySimpleProduct. Removes 'AssertProductPrice', 'moveMouseOverProduct', 'AssertAddToCart'</description>
83+
<description>DEPRECATED Use AssertStorefrontProductIsPresentOnCategoryPageActionGroup. EXTENDS:StorefrontCheckCategorySimpleProduct. Removes 'AssertProductPrice', 'moveMouseOverProduct', 'AssertAddToCart'</description>
8484
</annotations>
8585
<remove keyForRemoval="AssertProductPrice"/>
8686
<remove keyForRemoval="moveMouseOverProduct"/>

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="StorefrontFillFormAdvancedSearchWithCustomDropDownAttributeActionGroup" extends="StorefrontFillFormAdvancedSearchActionGroup">
12+
<annotations>
13+
<description>Fills in the advanced search form and select the attribute.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="attributeCode" type="string" defaultValue="{{productDropDownAttribute.attribute_code}}"/>
17+
<argument name="optionName" type="string" defaultValue="{{productAttributeOption1.label}}"/>
18+
</arguments>
19+
<selectOption userInput="{{optionName}}" selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode(attributeCode)}}" before="clickSubmit" stepKey="selectOption"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/CreateApiConfigurableProductWithProductAttributeAdvanceSearchActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="CreateApiConfigurableProductWithDescriptionActionGroup" extends="AdminCreateApiConfigurableProductActionGroup">
12+
<annotations>
13+
<description>Creates a Configurable Product with Description and 2 Product Options via API.</description>
14+
</annotations>
15+
16+
<!-- Replacement action. Create the configurable product via API. -->
17+
<createData entity="ApiConfigurableProductWithDescription" stepKey="createConfigProduct">
18+
<field key="name">{{productName}}</field>
19+
</createData>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Elasticsearch/Test/Mftf/Test/StorefrontCheckAdvancedSearchOnElasticSearchTest.xml

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
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="StorefrontCheckAdvancedSearchOnElasticSearchTest">
12+
<annotations>
13+
<features value="CatalogSearch"/>
14+
<stories value="Storefront Search"/>
15+
<title value="Check Advanced Search on ElasticSearch"/>
16+
<description value="Check Advanced Search on ElasticSearch"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MC-31115"/>
19+
<group value="SearchEngineElasticsearch"/>
20+
<group value="configurableProduct"/>
21+
<group value="catalog_search"/>
22+
</annotations>
23+
24+
<before>
25+
<!--Delete all product if exists-->
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
27+
<actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndexPage"/>
28+
<actionGroup ref="deleteProductsIfTheyExist" stepKey="deleteAllProducts"/>
29+
30+
<actionGroup ref="CreateApiConfigurableProductWithDescriptionActionGroup" stepKey="createConfigurableProduct">
31+
<argument name="productName" value="Product A"/>
32+
</actionGroup>
33+
<actionGroup ref="CreateApiConfigurableProductWithDescriptionActionGroup" stepKey="createConfigurableProductTwo">
34+
<argument name="productName" value="Product1234"/>
35+
</actionGroup>
36+
37+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
38+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
39+
<magentoCLI command="cache:flush" arguments="full_page" stepKey="flushFullPageCache"/>
40+
</before>
41+
42+
<after>
43+
<!-- Delete configurable products data -->
44+
<deleteData createDataKey="createConfigChildProduct1CreateConfigurableProduct" stepKey="deleteConfigChildProduct1"/>
45+
<deleteData createDataKey="createConfigChildProduct2CreateConfigurableProduct" stepKey="deleteConfigChildProduct2"/>
46+
<deleteData createDataKey="createConfigProductCreateConfigurableProduct" stepKey="deleteConfigProduct"/>
47+
<deleteData createDataKey="createConfigProductAttributeCreateConfigurableProduct" stepKey="deleteConfigProductAttribute"/>
48+
49+
<deleteData createDataKey="createConfigChildProduct1CreateConfigurableProductTwo" stepKey="deleteConfigChildProduct1ForSecondProduct"/>
50+
<deleteData createDataKey="createConfigChildProduct2CreateConfigurableProductTwo" stepKey="deleteConfigChildProduct2ForSecondProduct"/>
51+
<deleteData createDataKey="createConfigProductCreateConfigurableProductTwo" stepKey="deleteConfigProductTwo"/>
52+
<deleteData createDataKey="createConfigProductAttributeCreateConfigurableProductTwo" stepKey="deleteConfigProductAttributeForSecondProduct"/>
53+
54+
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
55+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
56+
<actionGroup ref="logout" stepKey="logoutFromAdmin"/>
57+
</after>
58+
59+
<!-- Navigate to Frontend -->
60+
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToStorefront"/>
61+
62+
<!-- Click "Advanced Search" -->
63+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="openAdvancedSearch"/>
64+
65+
<!-- Fill Configurable name in to field. Click "Search" button and assert product present-->
66+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByName">
67+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
68+
</actionGroup>
69+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResult"/>
70+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentOnCategoryPage">
71+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
72+
</actionGroup>
73+
74+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToStoreViewAdvancedCatalogSearch"/>
75+
<!-- Fill Configurable Two name in to field. Click "Search" button and assert product present-->
76+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductTwoByName">
77+
<argument name="productName" value="$createConfigProductCreateConfigurableProductTwo.name$"/>
78+
</actionGroup>
79+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="checkResultSearchConfigurableProductByName"/>
80+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductTwoIsPresentOnCategoryPage">
81+
<argument name="productName" value="$createConfigProductCreateConfigurableProductTwo.name$"/>
82+
</actionGroup>
83+
84+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedCatalogSearchPage"/>
85+
<!-- Fill Configurable partial name in to field. Click "Search" button and assert product present-->
86+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByPartialName">
87+
<argument name="productName" value="Product"/>
88+
</actionGroup>
89+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="checkResultSearchConfigurableProductByPartialName"/>
90+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductOneIsPresentAfterSearchByPartialName">
91+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
92+
</actionGroup>
93+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductTwoIsPresentAfterSearchByPartialName">
94+
<argument name="productName" value="$createConfigProductCreateConfigurableProductTwo.name$"/>
95+
</actionGroup>
96+
97+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedSearchForSearchProductByDescription"/>
98+
<!-- Fill Configurable short description in to field. Click "Search" button and assert product present-->
99+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByDescription">
100+
<argument name="description" value="$createConfigProductCreateConfigurableProduct.product[custom_attributes][0][value]$"/>
101+
</actionGroup>
102+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResultAfterSearchByDescription"/>
103+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentAfterSearchByDescription">
104+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
105+
</actionGroup>
106+
107+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedSearchForSearchProductByShortDescription"/>
108+
<!-- Fill Configurable short description in to field. Click "Search" button and assert product present-->
109+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByShortDescription">
110+
<argument name="short_description" value="$createConfigProductCreateConfigurableProduct.product[custom_attributes][1][value]$"/>
111+
</actionGroup>
112+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResultAfterSearchByShortDescription"/>
113+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentAfterSearchByShortDescription">
114+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
115+
</actionGroup>
116+
117+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedSearchForSearchProductsByPrice"/>
118+
<!-- Fill Configurable price in to fields. Click "Search" button and assert product present-->
119+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByPrice">
120+
<argument name="price_from" value="40"/>
121+
<argument name="price_to" value="123"/>
122+
</actionGroup>
123+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResultAfterSearchByPrice"/>
124+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentAfterSearchByPrice">
125+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
126+
</actionGroup>
127+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductTwoIsPresentAfterSearchByPrice">
128+
<argument name="productName" value="$createConfigProductCreateConfigurableProductTwo.name$"/>
129+
</actionGroup>
130+
131+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedCatalogSearchPageForSearchByDescriptionAndAttribute"/>
132+
<!-- Fill Configurable description in to field and select attribute. Click "Search" button and assert product present-->
133+
<actionGroup ref="StorefrontFillFormAdvancedSearchWithCustomDropDownAttributeActionGroup" stepKey="searchConfigurableProductByDescriptionAndAttribute">
134+
<argument name="description" value="$createConfigProductCreateConfigurableProduct.product[custom_attributes][0][value]$"/>
135+
<argument name="attributeCode" value="$createConfigProductAttributeCreateConfigurableProduct.attribute[attribute_code]$"/>
136+
<argument name="optionName" value="$createConfigProductAttributeOption1CreateConfigurableProduct.option[store_labels][0][label]$"/>
137+
</actionGroup>
138+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResultAfterSearchByDescriptionAndAttribute"/>
139+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentAfterSearchByDescriptionAndAttribute">
140+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
141+
</actionGroup>
142+
143+
<actionGroup ref="StorefrontOpenAdvancedSearchActionGroup" stepKey="goToAdvancedSearchForSearchProductByDescriptionAndShortDescription"/>
144+
<!-- Fill Configurable description and short description in to fields. Click "Search" button and assert product present-->
145+
<actionGroup ref="StorefrontFillFormAdvancedSearchActionGroup" stepKey="searchConfigurableProductByDescriptionAndShortDescription">
146+
<argument name="description" value="$createConfigProductCreateConfigurableProduct.product[custom_attributes][0][value]$"/>
147+
<argument name="short_description" value="$createConfigProductCreateConfigurableProduct.product[custom_attributes][1][value]$"/>
148+
</actionGroup>
149+
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="storefrontCheckAdvancedSearchResultAfterSearchByDescriptionAndShortDescription"/>
150+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="assertConfigurableProductIsPresentAfterSearchByDescriptionAndShortDescription">
151+
<argument name="productName" value="$createConfigProductCreateConfigurableProduct.name$"/>
152+
</actionGroup>
153+
</test>
154+
</tests>

0 commit comments

Comments
 (0)