Skip to content

Commit c321b2a

Browse files
glo74186glo74186
committed
Created sections
1 parent 2b71668 commit c321b2a

7 files changed

+141
-67
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminAddDataInCatalogStoreFrontDetailsActionGroup">
1212

13-
<click selector='//*[@id="catalog_frontend_list_mode"]' stepKey="clickListMode"/>
14-
<click selector='//option[@value="list-grid"]' stepKey="clickListGrid"/>
15-
<fillField selector='//*[@id="catalog_frontend_grid_per_page_values"]' userInput="1,10,50,100" stepKey="fillDataInGridAllowedValuesField"/>
16-
<fillField selector='//*[@id="catalog_frontend_grid_per_page"]' userInput="10" stepKey="fillDataInGridDefaultValueField"/>
17-
<fillField selector='//*[@id="catalog_frontend_list_per_page_values"]' userInput="1,10,30" stepKey="fillDataInListAllowedValuesField"/>
18-
<fillField selector='//*[@id="catalog_frontend_list_per_page"]' userInput="1" stepKey="fillDataInListDefaultValueField"/>
19-
<click selector='//*[@id="catalog_frontend_default_sort_by"]' stepKey="clickListingSortBy"/>
20-
<click selector="//option[@value='price']" stepKey="clickPrice"/>
21-
<click selector='//*[@id="catalog_frontend_list_allow_all"]' stepKey="clickProductsPerPage"/>
22-
<click selector='//option[@value="1"]' stepKey="clickYesButton"/>
13+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.listMode}}" stepKey="clickListMode"/>
14+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.listGrid}}" stepKey="clickGridList"/>
15+
<fillField selector="{{AdminChangesInCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" userInput="1,10,50,100" stepKey="fillDataInGridAllowedValuesField"/>
16+
<fillField selector="{{AdminChangesInCatalogStorefrontConfigSection.productsPerPageDefaultValue}}" userInput="10" stepKey="fillDataInGridDefaultValueField"/>
17+
<fillField selector="{{AdminChangesInCatalogStorefrontConfigSection.productsPerPageListAllowedValues}}" userInput="1,10,30" stepKey="fillDataInListAllowedValuesField"/>
18+
<fillField selector="{{AdminChangesInCatalogStorefrontConfigSection.productsPerPageListDefaultValue}}" userInput="1" stepKey="fillDataInListDefaultValueField"/>
19+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.productsListingSort}}" stepKey="clickListingSortBy"/>
20+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.priceProduct}}" stepKey="clickPrice"/>
21+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.productsPerPage}}" stepKey="clickProductsPerPage"/>
22+
<click selector="{{AdminChangesInCatalogStorefrontConfigSection.selectProductsPerPage}}" stepKey="clickYesButton"/>
23+
2324
</actionGroup>
2425
</actionGroups>

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminPreDefineDataInCatalogStoreFrontActionGroup">
1212

13-
<click selector='//*[@id="catalog_frontend_list_mode"]' stepKey="clickListMode"/>
14-
<click selector='//option[@value="grid-list"]' stepKey="clickGridList"/>
15-
<fillField selector='//*[@id="catalog_frontend_grid_per_page_values"]' userInput="12,24,36" stepKey="fillDataInGridAllowedValuesField"/>
16-
<fillField selector='//*[@id="catalog_frontend_grid_per_page"]' userInput="12" stepKey="fillDataInGridDefaultValueField"/>
17-
<fillField selector='//*[@id="catalog_frontend_list_per_page_values"]' userInput="5,10,15,20,25" stepKey="fillDataInListAllowedValuesField"/>
18-
<fillField selector='//*[@id="catalog_frontend_list_per_page"]' userInput="10" stepKey="fillDataInListDefaultValueField"/>
19-
<click selector='//*[@id="catalog_frontend_default_sort_by"]' stepKey="clickListingSortBy"/>
20-
<click selector="//option[@value='position']" stepKey="clickPosition"/>
21-
<click selector='//*[@id="catalog_frontend_list_allow_all"]' stepKey="clickProductsPerPage"/>
22-
<click selector='//option[@value="0"]' stepKey="clickNoButton"/>
23-
13+
<click selector="{{AdminCatalogStorefrontConfigSection.listMode}}" stepKey="clickListMode"/>
14+
<click selector="{{AdminCatalogStorefrontConfigSection.gridList}}" stepKey="clickGridList"/>
15+
<fillField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" userInput="12,24,36" stepKey="fillDataInGridAllowedValuesField"/>
16+
<fillField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageDefaultValue}}" userInput="12" stepKey="fillDataInGridDefaultValueField"/>
17+
<fillField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageListAllowedValues}}" userInput="5,10,15,20,25" stepKey="fillDataInListAllowedValuesField"/>
18+
<fillField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageListDefaultValue}}" userInput="10" stepKey="fillDataInListDefaultValueField"/>
19+
<click selector="{{AdminCatalogStorefrontConfigSection.productsListingSort}}" stepKey="clickListingSortBy"/>
20+
<click selector="{{AdminCatalogStorefrontConfigSection.positionProduct}}" stepKey="clickPosition"/>
21+
<click selector="{{AdminCatalogStorefrontConfigSection.productsPerPage}}" stepKey="clickProductsPerPage"/>
22+
<click selector="{{AdminCatalogStorefrontConfigSection.selectProductsPerPage}}" stepKey="clickNoButton"/>
2423
</actionGroup>
2524
</actionGroups>
2625

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

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,35 @@
1818

1919
<!-- verify changes in List mode -->
2020
<seeElement selector='//*[@id="maincontent"]//*[@data-value="list"]' stepKey="seePageInListView" />
21-
<click selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-grid']" stepKey="clickGridMode"/>
22-
<seeElement selector='//*[@id="maincontent"]/div[3]/div[1]/div[2]/div[1]/strong[2]' stepKey="seePageInGridView" />
23-
<click selector='//*[@id="mode-list"]' stepKey="switchToListMode1"/>
24-
<seeElement selector='(//ol[@class="products list items product-items"]/li)[1]' stepKey="seePageProduct" />
25-
<seeElement selector='.//*[@id="sorter"]//option[@value="price"]' stepKey="seeSortByPriceInListMode" />
26-
<click selector='//*[@id="limiter"]' stepKey="clickProductsPerPageButtonInListMode"/>
27-
<click selector='//*[@id="limiter"]/option[4]' stepKey="clickAllButton"/>
28-
<seeElement selector='//ol[@class="products list items product-items"]' stepKey="seeAllProducts" />
29-
<click selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='grid']" stepKey="switchToGridMode"/>
30-
<seeElement selector='//*[@id="maincontent"]/div[3]/div[1]/div[2]/div[1]/strong[2]' stepKey="seePageInGridView2" />
31-
<click selector='//*[@id="mode-list"]' stepKey="switchToListMode2"/>
32-
<seeElement selector="#maincontent > div.columns > div.column.main > div:nth-child(3) > div.modes > strong.modes-mode.active.mode-list" stepKey="seePageInListView1" />
33-
<click selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='grid']" stepKey="switchToGridMode3"/>
34-
<seeElement selector='//*[@id="maincontent"]/div[3]/div[1]/div[2]/div[1]/strong[2]' stepKey="seePageInGridView3" />
35-
<seeElement selector='//ol[@class="products list items product-items"]' stepKey="seeAllProducts1" />
36-
<seeElement selector='.//*[@id="sorter"]//option[@value="price"]' stepKey="seeSortByPriceInGridMode" />
37-
<click selector='//*[@id="limiter"]' stepKey="clickProductsPerPageInGridMode"/>
38-
<seeElement selector='(//*[@id="limiter"]/option)' stepKey="verifyingPagesInGrid1" />
39-
<seeElement selector='(//*[@id="limiter"]/option)[2]' stepKey="verifyingPagesInGrid2" />
40-
<seeElement selector='(//*[@id="limiter"]/option)[3]' stepKey="verifyingPagesInGrid3" />
41-
<seeElement selector='(//*[@id="limiter"]/option)[4]' stepKey="verifyingPagesInGrid4" />
42-
<seeElement selector='(//*[@id="limiter"]/option)[5]' stepKey="verifyingPagesInGrid5" />
21+
<!--<see selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInListView"/>-->
22+
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="clickGridMode"/>
23+
<waitForPageLoad stepKey="waitForGridMode"/>
24+
<see selector="{{AdminChecksListAndGridModeSection.gridView}}" stepKey="seePageInGridView"/>
25+
<click selector="{{AdminChecksListAndGridModeSection.listMode}}" stepKey="switchToListMode"/>
26+
<waitForPageLoad stepKey="waitForListMode"/>
27+
<see selector="{{AdminChecksListAndGridModeSection.pageProduct}}" stepKey="seePageProduct"/>
28+
<see selector="{{AdminChecksListAndGridModeSection.sortByPrice}}" stepKey="seeSortByPriceInListMode"/>
29+
<click selector="{{AdminChecksListAndGridModeSection.productsPerPage}}" stepKey="clickProductsPerPageButtonInListMode"/>
30+
<waitForPageLoad stepKey="waitForProductsPerPage"/>
31+
<click selector="{{AdminChecksListAndGridModeSection.allButton}}" stepKey="selectAllButton"/>
32+
<waitForPageLoad stepKey="waitForSelectAll"/>
33+
<see selector="{{AdminChecksListAndGridModeSection.allProducts}}" stepKey="seeAllProducts"/>
34+
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="switchToGridMode"/>
35+
<see selector="{{AdminChecksListAndGridModeSection.gridView}}" stepKey="seePageInGridView2"/>
36+
<click selector="{{AdminChecksListAndGridModeSection.listMode}}" stepKey="switchToListMode1"/>
37+
<see selector="{{AdminChecksListAndGridModeSection.listView}}" stepKey="seePageInListView1"/>
38+
<click selector="{{AdminChecksListAndGridModeSection.gridMode}}" stepKey="switchToGridMode1"/>
39+
<see selector="{{AdminChecksListAndGridModeSection.allProducts}}" stepKey="seePageProductsInGrid"/>
40+
<see selector="{{AdminChecksListAndGridModeSection.sortByPrice}}" stepKey="seeSortByPriceInGridMode"/>
41+
<click selector="{{AdminChecksListAndGridModeSection.productsPerPage}}" stepKey="clickProductsPerPageButtonInGridMode"/>
42+
<waitForPageLoad stepKey="waitForProductsPerPageOpen"/>
43+
<see selector="{{AdminChecksListAndGridModeSection.pageOptions1}}" stepKey="seePageOptions1"/>
44+
<see selector="{{AdminChecksListAndGridModeSection.pageOptions2}}" stepKey="seePageOptions2"/>
45+
<see selector="{{AdminChecksListAndGridModeSection.pageOptions3}}" stepKey="seePageOptions3"/>
46+
<see selector="{{AdminChecksListAndGridModeSection.pageOptions4}}" stepKey="seePageOptions4"/>
47+
<see selector="{{AdminChecksListAndGridModeSection.pageOptions5}}" stepKey="seePageOptions5"/>
48+
49+
50+
4351
</actionGroup>
4452
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminCatalogStorefrontConfigSection.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,18 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminCatalogStorefrontConfigSection">
12+
1213
<element name="sectionHeader" type="button" selector="#catalog_frontend-head"/>
14+
<element name="listMode" type="button" selector='//*[@id="catalog_frontend_list_mode"]'/>
15+
<element name="gridList" type="button" selector='//option[@value="grid-list"]'/>
1316
<element name="productsPerPageAllowedValues" type="input" selector="#catalog_frontend_grid_per_page_values"/>
1417
<element name="productsPerPageDefaultValue" type="input" selector="#catalog_frontend_grid_per_page"/>
18+
<element name="productsPerPageListAllowedValues" type="input" selector='//*[@id="catalog_frontend_list_per_page_values"]'/>
19+
<element name="productsPerPageListDefaultValue" type="input" selector='//*[@id="catalog_frontend_list_per_page"]'/>
20+
<element name="productsListingSort" type="button" selector='//*[@id="catalog_frontend_default_sort_by"]'/>
21+
<element name="positionProduct" type="button" selector='//option[@value="position"]'/>
22+
<element name="productsPerPage" type="button" selector='//*[@id="catalog_frontend_list_allow_all"]'/>
23+
<element name="selectProductsPerPage" type="button" selector='//option[@value="0"]'/>
1524
</section>
1625
</sections>
26+

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminChangesInCatalogStorefrontConfigSection.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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminChangesInCatalogStorefrontConfigSection">
12+
13+
<element name="listMode" type="button" selector='//*[@id="catalog_frontend_list_mode"]'/>
14+
<element name="listGrid" type="button" selector='//option[@value="list-grid"]'/>
15+
<element name="productsPerPageAllowedValues" type="input" selector='//*[@id="catalog_frontend_grid_per_page_values"]'/>
16+
<element name="productsPerPageDefaultValue" type="input" selector='//*[@id="catalog_frontend_grid_per_page"]'/>
17+
<element name="productsPerPageListAllowedValues" type="input" selector='//*[@id="catalog_frontend_list_per_page_values"]'/>
18+
<element name="productsPerPageListDefaultValue" type="input" selector='//*[@id="catalog_frontend_list_per_page"]'/>
19+
<element name="productsListingSort" type="button" selector='//*[@id="catalog_frontend_default_sort_by"]'/>
20+
<element name="priceProduct" type="button" selector='//option[@value="price"]'/>
21+
<element name="productsPerPage" type="button" selector='//*[@id="catalog_frontend_list_allow_all"]'/>
22+
<element name="selectProductsPerPage" type="button" selector='//option[@value="1"]'/>
23+
24+
</section>
25+
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminChecksListAndGridModeSection.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="AdminChecksListAndGridModeSection">
12+
13+
<element name="listView" type="text" selector='//*[@id="maincontent"]//*[@data-value="list"]'/>
14+
<element name="gridMode" type="button" selector=".//*[@class='toolbar toolbar-products'][1]//*[@id='mode-grid']"/>
15+
<element name="gridView" type="text" selector='//*[@id="maincontent"]//*[@data-value="grid"]'/>
16+
<element name="listMode" type="button" selector='//*[@id="mode-list"]'/>
17+
<element name="pageProduct" type="text" selector='(//ol[@class="products list items product-items"]/li)[1]'/>
18+
<element name="sortByPrice" type="text" selector='.//*[@id="sorter"]//option[@value="price"]'/>
19+
<element name="productsPerPage" type="button" selector='/*[@id="limiter"]'/>
20+
<element name="allButton" type="button" selector='//*[@id="limiter"]/option[4]'/>
21+
<element name="allProducts" type="text" selector='//ol[@class="products list items product-items"]'/>
22+
<element name="pageOptions1" type="text" selector='(//*[@id="limiter"]/option)'/>
23+
<element name="pageOptions2" type="text" selector='(//*[@id="limiter"]/option)[2]'/>
24+
<element name="pageOptions3" type="text" selector='(//*[@id="limiter"]/option)[3]'/>
25+
<element name="pageOptions4" type="text" selector='//*[@id="limiter"]/option)[4]'/>
26+
<element name="pageOptions5" type="text" selector='(//*[@id="limiter"]/option)[5]'/>
27+
28+
29+
30+
</section>
31+
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyCatalogStorefrontConfigurationSettingsTest.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,20 @@
124124
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForGridDefaultValue">
125125
<argument name="rowId" value="row_catalog_frontend_grid_per_page"/>
126126
</actionGroup>
127-
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForAllowedValues">
127+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForAllowedValues">
128128
<argument name="rowId" value="row_catalog_frontend_list_per_page_values"/>
129-
</actionGroup>
130-
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForListDefaultValue">
131-
<argument name="rowId" value="row_catalog_frontend_list_per_page"/>
132-
</actionGroup>
133-
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForListSortingBy">
129+
</actionGroup>
130+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForListDefaultValue">
131+
<argument name="rowId" value="row_catalog_frontend_list_per_page"/>
132+
</actionGroup>
133+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForListSortingBy">
134134
<argument name="rowId" value="row_catalog_frontend_default_sort_by"/>
135-
</actionGroup>
136-
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForProductsPerPage">
135+
</actionGroup>
136+
<actionGroup ref="AdminUncheckUseSystemValueActionGroup" stepKey="uncheckUseSystemValueForProductsPerPage">
137137
<argument name="rowId" value="row_catalog_frontend_list_allow_all"/>
138-
</actionGroup>
139-
<actionGroup ref="AdminAddDataInCatalogStoreFrontDetailsActionGroup" stepKey="fillingDataInStoreFrontFields"/>
140-
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurations"/>
138+
</actionGroup>
139+
<actionGroup ref="AdminAddDataInCatalogStoreFrontDetailsActionGroup" stepKey="fillingDataInStoreFrontFields"/>
140+
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurations"/>
141141

142142
<!--Clean cache and reindex-->
143143
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -147,27 +147,27 @@
147147
<argument name="tags" value=""/>
148148
</actionGroup>
149149

150-
<!-- navigate to created category page and check the products per page -->
151-
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage1">
152-
<argument name="category" value="$$createCategory$$"/>
153-
</actionGroup>
150+
<!-- navigate to created category page and check the products per page -->
151+
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage1">
152+
<argument name="category" value="$$createCategory$$"/>
153+
</actionGroup>
154154

155155

156156

157157

158-
<!-- Go to storefront created category page and verifies list and grid mode -->
159-
<actionGroup ref="AdminVerifiesListAndGridModeActionGroup" stepKey="ChangesInListAndGridMode"/>
158+
<!-- Go to storefront created category page and verifies list and grid mode -->
159+
<actionGroup ref="AdminVerifiesListAndGridModeActionGroup" stepKey="ChangesInListAndGridMode"/>
160160

161161

162162

163163
<!-- again navigate to created category page and check the products per page-->
164-
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage2">
164+
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="navigateToCategoryPage2">
165165
<argument name="category" value="$$createCategory$$"/>
166-
</actionGroup>
166+
</actionGroup>
167167

168-
<click selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='grid']" stepKey="switchToGridMode4"/>
169-
<seeElement selector='//ol[@class="products list items product-items"]' stepKey="see10ProductsVisible" />
168+
<click selector=".//*[@class='toolbar toolbar-products'][1]//*[@data-value='grid']" stepKey="switchToGridMode4"/>
169+
<seeElement selector='//ol[@class="products list items product-items"]' stepKey="see10ProductsVisible" />
170170

171-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
172-
</test>
173-
</tests>
171+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
172+
</test>
173+
</tests>

0 commit comments

Comments
 (0)