Skip to content

Commit cb215ff

Browse files
tomreecetomreece
authored
Merge pull request #86 from magento-pangolin/MC-4439
2 parents 643eb80 + 5746022 commit cb215ff

File tree

5 files changed

+109
-2
lines changed

5 files changed

+109
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCatalogSearchTermNewSection">
12-
<element name="searchQuery" type="text" selector="//div[@class='admin__field-control control']/input[@id='query_text']"/>
13-
<element name="store" type="text" selector="//select[@id='store_id']"/>
12+
<element name="searchQuery" type="text" selector="#query_text"/>
13+
<element name="store" type="text" selector="#store_id"/>
14+
<element name="numberOfResults" type="button" selector="#num_results"/>
15+
<element name="numberOfUses" type="button" selector="#popularity"/>
1416
<element name="redirectUrl" type="text" selector="//div[@class='admin__field-control control']/input[@id='redirect']"/>
1517
<element name="displayInSuggestedTerm" type="select" selector="//select[@name='display_in_terms']"/>
1618
<element name="saveSearchButton" type="button" selector="//button[@id='save']/span[@class='ui-button-text']" timeout="30"/>

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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="StorefrontUpdateSearchTermEntityTest">
12+
<annotations>
13+
<stories value="Storefront Search"/>
14+
<title value="Update Storefront Search Results"/>
15+
<description value="You should see the updated Search Term on the Storefront via the Admin."/>
16+
<testCaseId value="MC-13987"/>
17+
<severity value="CRITICAL"/>
18+
<group value="search"/>
19+
<group value="mtf_migrated"/>
20+
</annotations>
21+
22+
<before>
23+
<createData entity="_defaultCategory" stepKey="createCategory1"/>
24+
<createData entity="SimpleProduct" stepKey="createProduct1">
25+
<requiredEntity createDataKey="createCategory1"/>
26+
</createData>
27+
28+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage1"/>
29+
<waitForPageLoad stepKey="waitForPageLoad1"/>
30+
</before>
31+
<after>
32+
<actionGroup ref="logout" stepKey="logoutOfAdmin1"/>
33+
34+
<deleteData createDataKey="createProduct1" stepKey="deleteSimpleProduct1"/>
35+
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
36+
</after>
37+
38+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName1">
39+
<argument name="phrase" value="$$createProduct1.name$$"/>
40+
</actionGroup>
41+
42+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
43+
44+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage1"/>
45+
<waitForPageLoad stepKey="waitForPageLoad1"/>
46+
47+
<actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery1">
48+
<argument name="searchQuery" value="$$createProduct1.name$$"/>
49+
</actionGroup>
50+
51+
<click selector="{{AdminGridRow.editByValue($$createProduct1.name$$)}}" stepKey="clickOnSearchResult1"/>
52+
<waitForPageLoad stepKey="waitForPageLoad2"/>
53+
54+
<actionGroup ref="AdminFillAllSearchTermFieldsActionGroup" stepKey="searchForSearchTerm1">
55+
<argument name="searchTerm" value="UpdatedSearchTermData1"/>
56+
</actionGroup>
57+
58+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage2"/>
59+
<waitForPageLoad stepKey="waitForPageLoad3"/>
60+
61+
<actionGroup ref="searchTermFilterBySearchQuery" stepKey="filterByFirstSearchQuery2">
62+
<argument name="searchQuery" value="{{UpdatedSearchTermData1.query_text}}"/>
63+
</actionGroup>
64+
65+
<amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnStorefrontPage2"/>
66+
<waitForPageLoad stepKey="waitForPageLoad4"/>
67+
68+
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByProductName2">
69+
<argument name="phrase" value="{{UpdatedSearchTermData1.query_text}}"/>
70+
</actionGroup>
71+
</test>
72+
</tests>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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="AdminFillAllSearchTermFieldsActionGroup">
12+
<arguments>
13+
<argument name="searchTerm" type="entity"/>
14+
</arguments>
15+
16+
<fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchTerm.query_text}}" stepKey="fillSearchQuery1"/>
17+
<selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{searchTerm.store_id}}" stepKey="selectStore1"/>
18+
<fillField selector="{{AdminCatalogSearchTermNewSection.numberOfResults}}" userInput="{{searchTerm.number_of_results}}" stepKey="fillNumberOfResults1"/>
19+
<fillField selector="{{AdminCatalogSearchTermNewSection.numberOfUses}}" userInput="{{searchTerm.number_of_uses}}" stepKey="fillNumberOfUses1"/>
20+
<selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{searchTerm.display_in_suggested_term}}" stepKey="selectDisplayInSuggestedTerms1"/>
21+
22+
<click selector="{{AdminConfigSection.saveButton}}" stepKey="clickOnSaveButton1"/>
23+
</actionGroup>
24+
</actionGroups>

‎app/code/Magento/Search/Test/Mftf/Data/SearchTermData.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,12 @@
1414
<data key="redirect" unique="suffix">http://example.com/</data>
1515
<data key="display_in_terms">0</data>
1616
</entity>
17+
<entity name="UpdatedSearchTermData1" type="searchTerm">
18+
<data key="query_text" unique="suffix">UpdatedSearchTerm</data>
19+
<data key="store_id">Default Store View</data>
20+
<data key="number_of_results">1</data>
21+
<data key="number_of_uses">20</data>
22+
<data key="redirect_url">http://example.com</data>
23+
<data key="display_in_suggested_term">No</data>
24+
</entity>
1725
</entities>

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/UpdateSearchTermEntityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<data name="searchTerm/data/popularity" xsi:type="string">20</data>
1515
<data name="searchTerm/data/redirect" xsi:type="string">http://example.com/</data>
1616
<data name="searchTerm/data/display_in_terms" xsi:type="string">No</data>
17+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1718
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermSuccessSaveMessage" />
1819
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermForm" />
1920
<constraint name="Magento\CatalogSearch\Test\Constraint\AssertSearchTermInGrid" />

0 commit comments

Comments
 (0)