Skip to content

Commit 54160b7

Browse files
lbajsarowiczlbajsarowicz
committed
REFACTOR: Extract Action Groups to separate files (according to MFTF best practices)
1 parent c7ca62e commit 54160b7

File tree

33 files changed

+619
-413
lines changed

33 files changed

+619
-413
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontCustomerSearchBundleProductsByKeywordsTest.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,84 +53,84 @@
5353
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchDynamic">
5454
<argument name="phrase" value="Dynamic"/>
5555
</actionGroup>
56-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="assertDynamicBundleInSearchResultByDynamic">
56+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertDynamicBundleInSearchResultByDynamic">
5757
<argument name="productName" value="$createDynamicBundle.name$"/>
5858
</actionGroup>
59-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="assertFixedBundleInSearchResultByDynamic">
59+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="assertFixedBundleInSearchResultByDynamic">
6060
<argument name="productName" value="$createFixedBundle.name$"/>
6161
</actionGroup>
6262
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByDescription">
6363
<argument name="phrase" value="Dynamicscription"/>
6464
</actionGroup>
65-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="assertDynamicBundleInSearchResultByDescription">
65+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertDynamicBundleInSearchResultByDescription">
6666
<argument name="productName" value="$createDynamicBundle.name$"/>
6767
</actionGroup>
68-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeFixedBundleInSearchResultByDescription">
68+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="dontSeeFixedBundleInSearchResultByDescription">
6969
<argument name="productName" value="$createFixedBundle.name$"/>
7070
</actionGroup>
7171
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchShortDescription">
7272
<argument name="phrase" value="Dynamictest"/>
7373
</actionGroup>
74-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="assertDynamicBundleInSearchResultByShortDescription">
74+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="assertDynamicBundleInSearchResultByShortDescription">
7575
<argument name="productName" value="$createDynamicBundle.name$"/>
7676
</actionGroup>
77-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeFixedBundleInSearchResultByShortDescription">
77+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="dontSeeFixedBundleInSearchResultByShortDescription">
7878
<argument name="productName" value="$createFixedBundle.name$"/>
7979
</actionGroup>
8080
<!-- 3. Fill quick search bar with test values mutual for both products and click search -->
8181
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchTest123">
8282
<argument name="phrase" value="Test 123"/>
8383
</actionGroup>
84-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeDynamicBundleByTest123">
84+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeDynamicBundleByTest123">
8585
<argument name="productName" value="$createDynamicBundle.name$"/>
8686
</actionGroup>
87-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByTest123">
87+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByTest123">
8888
<argument name="productName" value="$createFixedBundle.name$"/>
8989
</actionGroup>
9090
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchTesting321">
9191
<argument name="phrase" value="Testing 321"/>
9292
</actionGroup>
93-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeDynamicBundleByTesting321">
93+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeDynamicBundleByTesting321">
9494
<argument name="productName" value="$createDynamicBundle.name$"/>
9595
</actionGroup>
96-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByTesting321">
96+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByTesting321">
9797
<argument name="productName" value="$createFixedBundle.name$"/>
9898
</actionGroup>
9999
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchShort555">
100100
<argument name="phrase" value="Short 555"/>
101101
</actionGroup>
102-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeDynamicBundleByShort555">
102+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeDynamicBundleByShort555">
103103
<argument name="productName" value="$createDynamicBundle.name$"/>
104104
</actionGroup>
105-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByShort555">
105+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByShort555">
106106
<argument name="productName" value="$createFixedBundle.name$"/>
107107
</actionGroup>
108108
<!-- 4. Fill quick search bar with test values unique for fixed bundle product and click search -->
109109
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByFixed">
110110
<argument name="phrase" value="Fixed"/>
111111
</actionGroup>
112-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByFixed">
112+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByFixed">
113113
<argument name="productName" value="$createFixedBundle.name$"/>
114114
</actionGroup>
115-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeDynamicBundleByFixed">
115+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="dontSeeDynamicBundleByFixed">
116116
<argument name="productName" value="$createDynamicBundle.name$"/>
117117
</actionGroup>
118118
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByDescriptionForFixed">
119119
<argument name="phrase" value="Fixedscription"/>
120120
</actionGroup>
121-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByDescriptionForFixed">
121+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByDescriptionForFixed">
122122
<argument name="productName" value="$createFixedBundle.name$"/>
123123
</actionGroup>
124-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeDynamicProductByDescriptionForFixed">
124+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="dontSeeDynamicProductByDescriptionForFixed">
125125
<argument name="productName" value="$createDynamicBundle.name$"/>
126126
</actionGroup>
127127
<actionGroup ref="StorefrontCheckQuickSearchStringActionGroup" stepKey="quickSearchByShortDescriptionForFixed">
128128
<argument name="phrase" value="Fixedtest"/>
129129
</actionGroup>
130-
<actionGroup ref="StorefrontQuickSearchSeeProductByName" stepKey="seeFixedBundleByShortDescriptionForFixed">
130+
<actionGroup ref="StorefrontQuickSearchSeeProductByNameActionGroup" stepKey="seeFixedBundleByShortDescriptionForFixed">
131131
<argument name="productName" value="$createFixedBundle.name$"/>
132132
</actionGroup>
133-
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGrid" stepKey="dontSeeDynamicBundleByShortDescriptionForFixed">
133+
<actionGroup ref="StorefrontQuickSearchCheckProductNameNotInGridActionGroup" stepKey="dontSeeDynamicBundleByShortDescriptionForFixed">
134134
<argument name="productName" value="$createDynamicBundle.name$"/>
135135
</actionGroup>
136136
</test>

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

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AssertSearchTermNotInGridActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertSearchTermNotInGridActionGroup">
12+
<annotations>
13+
<description>Goes to the Catalog Search Term grid page. Searches for the provided Search Term. Validates that it is NOT present in the grid.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="searchQuery" type="string"/>
17+
</arguments>
18+
19+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openCatalogSearchIndexPage"/>
20+
<waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
21+
<click selector="{{AdminCatalogSearchTermIndexSection.resetFilterButton}}" stepKey="clickOnResetButton"/>
22+
<waitForPageLoad stepKey="waitForPageToLoad"/>
23+
<fillField selector="{{AdminCatalogSearchTermIndexSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
24+
<click selector="{{AdminCatalogSearchTermIndexSection.searchButton}}" stepKey="clickSearchButton"/>
25+
<waitForPageLoad stepKey="waitForSearchResultToLoad"/>
26+
<see selector="{{AdminCatalogSearchTermIndexSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
27+
</actionGroup>
28+
</actionGroups>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchTermActionGroup.xml renamed to ‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AssertSearchTermNotOnFrontendActionGroup.xml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!--Verify AssertSearchTermNotOnFrontend-->
12-
<actionGroup name="AssertSearchTermNotOnFrontend">
12+
<actionGroup name="AssertSearchTermNotOnFrontendActionGroup">
1313
<annotations>
1414
<description>Goes to the Storefront. Fills the Search field with the provided Search Query. Clicks on Search. Validates that there are no results.</description>
1515
</annotations>
@@ -26,20 +26,4 @@
2626
<waitForPageLoad stepKey="waitForSearch"/>
2727
<see selector="{{StorefrontMessagesSection.noticeMessage}}" userInput="Your search returned no results." stepKey="seeAssertSearchTermNotOnFrontendNoticeMessage"/>
2828
</actionGroup>
29-
30-
<actionGroup name="AssertSearchTermOnFrontend">
31-
<annotations>
32-
<description>Fills the Storefront Search field with the provided Search Query. Clicks on Search. Validates that the URL is correct.</description>
33-
</annotations>
34-
<arguments>
35-
<argument name="searchQuery" type="string"/>
36-
<argument name="redirectUrl" type="string"/>
37-
</arguments>
38-
39-
<fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
40-
<waitForPageLoad stepKey="waitForFillField"/>
41-
<click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
42-
<waitForPageLoad stepKey="waitForSearch"/>
43-
<seeInCurrentUrl url="{{redirectUrl}}" stepKey="checkUrl"/>
44-
</actionGroup>
4529
</actionGroups>

‎app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/AssertSearchTermOnFrontendActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AssertSearchTermOnFrontendActionGroup">
12+
<annotations>
13+
<description>Fills the Storefront Search field with the provided Search Query. Clicks on Search. Validates that the URL is correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="searchQuery" type="string"/>
17+
<argument name="redirectUrl" type="string"/>
18+
</arguments>
19+
20+
<fillField selector="{{StorefrontQuickSearchResultsSection.searchTextBox}}" userInput="{{searchQuery}}" stepKey="fillSearchQuery"/>
21+
<waitForPageLoad stepKey="waitForFillField"/>
22+
<click selector="{{StorefrontQuickSearchResultsSection.searchTextBoxButton}}" stepKey="clickSearchTextBoxButton"/>
23+
<waitForPageLoad stepKey="waitForSearch"/>
24+
<seeInCurrentUrl url="{{redirectUrl}}" stepKey="checkUrl"/>
25+
</actionGroup>
26+
</actionGroups>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="AssertSearchTermSaveSuccessMessageActionGroup">
12+
<annotations>
13+
<description>Goes to the Catalog Search Term grid page. Adds the provided Search Term. Validates that the Success Message is present and correct.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="searchQuery" type="string"/>
17+
<argument name="storeValue" type="string"/>
18+
<argument name="redirectUrl" type="string"/>
19+
<argument name="displayInSuggestedTerm" type="string"/>
20+
</arguments>
21+
22+
<amOnPage url="{{AdminCatalogSearchTermIndexPage.url}}" stepKey="openAdminCatalogSearchTermIndexPage"/>
23+
<waitForPageLoad stepKey="waitForAdminCatalogSearchTermIndexPageLoad"/>
24+
<click selector="{{AdminCatalogSearchTermIndexSection.addNewSearchTermButton}}" stepKey="clickAddNewSearchTermButton"/>
25+
<waitForPageLoad stepKey="waitForAdminCatalogSearchTermNewPageLoad"/>
26+
<fillField selector="{{AdminCatalogSearchTermNewSection.searchQuery}}" userInput="{{searchQuery}}" stepKey="fillSearchQueryTextBox"/>
27+
<selectOption selector="{{AdminCatalogSearchTermNewSection.store}}" userInput="{{storeValue}}" stepKey="selectStoreValue"/>
28+
<fillField selector="{{AdminCatalogSearchTermNewSection.redirectUrl}}" userInput="{{redirectUrl}}" stepKey="fillRedirectUrl"/>
29+
<selectOption selector="{{AdminCatalogSearchTermNewSection.displayInSuggestedTerm}}" userInput="{{displayInSuggestedTerm}}" stepKey="selectDisplayInSuggestedTerm"/>
30+
<click selector="{{AdminCatalogSearchTermNewSection.saveSearchButton}}" stepKey="clickSaveSearchButton"/>
31+
<see selector="{{AdminCatalogSearchTermMessagesSection.successMessage}}" userInput="You saved the search term." stepKey="seeSaveSuccessMessage"/>
32+
</actionGroup>
33+
</actionGroups>

0 commit comments

Comments
 (0)