Skip to content

Commit 4808977

Browse files
irenelagnoirenelagno
authored
Merge pull request magento#4757 from magento-epam/EPAM-PR-72
- fixed default product numbers to display results in poor display on Desktop
2 parents 88d78b2 + 2cacbee commit 4808977

6 files changed

+284
-38
lines changed

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

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="AdminCatalogStorefrontConfigSection">
12+
<element name="sectionHeader" type="button" selector="#catalog_frontend-head"/>
13+
<element name="productsPerPageAllowedValues" type="input" selector="#catalog_frontend_grid_per_page_values"/>
14+
<element name="productsPerPageDefaultValue" type="input" selector="#catalog_frontend_grid_per_page"/>
15+
</section>
16+
</sections>

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

+63-34
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
<createData entity="PaginationProduct" stepKey="simpleProduct18"/>
4242
<createData entity="PaginationProduct" stepKey="simpleProduct19"/>
4343
<createData entity="PaginationProduct" stepKey="simpleProduct20"/>
44+
<createData entity="PaginationProduct" stepKey="simpleProduct21"/>
45+
<createData entity="PaginationProduct" stepKey="simpleProduct22"/>
46+
<createData entity="PaginationProduct" stepKey="simpleProduct23"/>
47+
<createData entity="PaginationProduct" stepKey="simpleProduct24"/>
48+
<createData entity="PaginationProduct" stepKey="simpleProduct25"/>
49+
<createData entity="PaginationProduct" stepKey="simpleProduct26"/>
50+
<createData entity="PaginationProduct" stepKey="simpleProduct27"/>
51+
<createData entity="PaginationProduct" stepKey="simpleProduct28"/>
52+
<createData entity="PaginationProduct" stepKey="simpleProduct29"/>
53+
<createData entity="PaginationProduct" stepKey="simpleProduct30"/>
4454
<actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel"/>
4555
</before>
4656
<after>
@@ -67,110 +77,129 @@
6777
<deleteData createDataKey="simpleProduct18" stepKey="deleteSimpleProduct18"/>
6878
<deleteData createDataKey="simpleProduct19" stepKey="deleteSimpleProduct19"/>
6979
<deleteData createDataKey="simpleProduct20" stepKey="deleteSimpleProduct20"/>
80+
<deleteData createDataKey="simpleProduct21" stepKey="deleteSimpleProduct21"/>
81+
<deleteData createDataKey="simpleProduct22" stepKey="deleteSimpleProduct22"/>
82+
<deleteData createDataKey="simpleProduct23" stepKey="deleteSimpleProduct23"/>
83+
<deleteData createDataKey="simpleProduct24" stepKey="deleteSimpleProduct24"/>
84+
<deleteData createDataKey="simpleProduct25" stepKey="deleteSimpleProduct25"/>
85+
<deleteData createDataKey="simpleProduct26" stepKey="deleteSimpleProduct26"/>
86+
<deleteData createDataKey="simpleProduct27" stepKey="deleteSimpleProduct27"/>
87+
<deleteData createDataKey="simpleProduct28" stepKey="deleteSimpleProduct28"/>
88+
<deleteData createDataKey="simpleProduct29" stepKey="deleteSimpleProduct29"/>
89+
<deleteData createDataKey="simpleProduct30" stepKey="deleteSimpleProduct30"/>
7090
<actionGroup ref="logout" stepKey="logout"/>
7191
</after>
72-
92+
<!--Verify default number of products displayed in the grid view-->
93+
<comment userInput="Verify default number of products displayed in the grid view" stepKey="commentVerifyDefaultValues"/>
94+
<amOnPage url="{{CatalogConfigPage.url}}" stepKey="goToCatalogConfigPagePage"/>
95+
<waitForPageLoad stepKey="waitForConfigPageLoad" />
96+
<conditionalClick selector="{{AdminCatalogStorefrontConfigSection.sectionHeader}}" dependentSelector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" visible="false" stepKey="openCatalogConfigStorefrontSection"/>
97+
<waitForElementVisible selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" stepKey="waitForSectionOpen"/>
98+
<seeInField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageAllowedValues}}" userInput="12,24,36" stepKey="seeDefaultValueAllowedNumberProductsPerPage"/>
99+
<seeInField selector="{{AdminCatalogStorefrontConfigSection.productsPerPageDefaultValue}}" userInput="12" stepKey="seeDefaultValueProductPerPage"/>
73100
<!--Open Category Page and select created category-->
101+
<comment userInput="Open Category Page and select created category" stepKey="commentOpenCategoryPage"/>
74102
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="openAdminCategoryIndexPage"/>
75103
<waitForPageLoad stepKey="waitForPageToLoad1"/>
76104
<click selector="{{AdminCategorySidebarTreeSection.expandAll}}" stepKey="clickOnExpandTree"/>
77105
<waitForPageLoad stepKey="waitForPageToLoad0"/>
78106
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
79107
<waitForPageLoad stepKey="waitForPageToLoaded2"/>
80-
81108
<!--Select Products-->
109+
<comment userInput="Select Products" stepKey="commentSelectProducts"/>
82110
<scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>
83111
<click selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" stepKey="clickOnProductInCategory"/>
84112
<waitForPageLoad stepKey="waitForProductsToLoad"/>
85113
<scrollTo selector="{{CatalogProductsSection.resetFilter}}" stepKey="scrollToResetFilter"/>
86114
<waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
87115
<click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
88116
<waitForPageLoad stepKey="waitForPageToLoad3"/>
89-
<selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
117+
<selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="30" stepKey="selectPagePerView"/>
118+
<wait stepKey="waitFroPageToLoad1" time="30"/>
90119
<fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi" stepKey="selectProduct1"/>
91120
<click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
92-
<waitForPageLoad stepKey="waitFroPageToLoad1"/>
93-
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
121+
<waitForPageLoad stepKey="waitFroPageToLoad2"/>
122+
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="30" stepKey="seeNumberOfProductsFound"/>
94123
<click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
95124
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
96125
<waitForPageLoad stepKey="waitForCategorySaved"/>
97126
<see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the category." stepKey="assertSuccessMessage"/>
98127
<waitForPageLoad stepKey="waitForPageTitleToBeSaved"/>
99-
100128
<!--Open Category Store Front Page-->
129+
<comment userInput="Open Category Store Front Page" stepKey="commentOpenCategoryOnStorefront"/>
101130
<amOnPage url="{{_defaultCategory.name}}.html" stepKey="goToStorefront"/>
102131
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
103132
<seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="seeCategoryOnNavigation"/>
104133
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
105134
<waitForPageLoad stepKey="waitForProductToLoad"/>
106-
107-
<!--Select 9 items per page and verify number of products displayed in each page -->
135+
<!--Select 12 items per page and verify number of products displayed in each page -->
136+
<comment userInput="Select 12 items per page and verify number of products displayed in each page" stepKey="comment12ItemsPerPage"/>
108137
<conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
109138
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
110-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
111-
139+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="12" stepKey="selectPerPageOption"/>
112140
<!--Verify number of products displayed in First Page -->
113-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
114-
141+
<comment userInput="Verify number of products displayed in First Page" stepKey="commentVerifyNumberOfProducts"/>
142+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
115143
<!--Verify number of products displayed in Second Page -->
144+
<comment userInput="Verify number of products displayed in Second Page" stepKey="commentVerifyNumberOfProductsSecondPage"/>
116145
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
117146
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
118147
<waitForPageLoad stepKey="waitForPageToLoad4"/>
119-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
120-
148+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage"/>
121149
<!--Verify number of products displayed in third Page -->
150+
<comment userInput="Verify number of products displayed in third Page" stepKey="commentVerifyNumberOfProductsThirdPage"/>
122151
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
123152
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
124153
<waitForPageLoad stepKey="waitForPageToLoad2"/>
125-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
126-
154+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage"/>
127155
<!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
156+
<comment userInput="Change Pages using Previous Page selector and verify number of products displayed in each page" stepKey="commentVerifyProductsOnEachPage"/>
128157
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
129158
<click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
130159
<waitForPageLoad stepKey="waitForPageToLoad5"/>
131-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
160+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage1"/>
132161
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
133162
<click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
134163
<waitForPageLoad stepKey="waitForPageToLoad6"/>
135-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
136-
164+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage1"/>
137165
<!--Select Pages by using page Number and verify number of products displayed-->
166+
<comment userInput="Select Pages by using page Number and verify number of products displayed" stepKey="commentSelectPagesAndVerify"/>
138167
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
139168
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
140169
<waitForPageLoad stepKey="waitForPageToLoad7"/>
141-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
142-
170+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage2"/>
143171
<!--Select Third Page using page number-->
172+
<comment userInput="Select Third Page using page number" stepKey="commentSelectThirdPage"/>
144173
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
145174
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
146175
<waitForPageLoad stepKey="waitForPageToLoad8"/>
147-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
148-
176+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage2"/>
149177
<!--Select First Page using page number-->
178+
<comment userInput="Select First Page using page number" stepKey="commentSelectFirstPage"/>
150179
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
151180
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
152181
<waitForPageLoad stepKey="waitForPageToLoad9"/>
153-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
154-
155-
<!--Select 15 items per page and verify number of products displayed in each page -->
182+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsFirstPage2"/>
183+
<!--Select 24 items per page and verify number of products displayed in each page -->
184+
<comment userInput="Select 24 items per page and verify number of products displayed in each page" stepKey="commentSelect24ItemsPerPage"/>
156185
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
157-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
186+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="24" stepKey="selectPerPageOption1"/>
158187
<waitForPageLoad stepKey="waitForPageToLoad10"/>
159-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
188+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="24" stepKey="seeNumberOfProductsInFirstPage3"/>
160189
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
161190
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
162191
<waitForPageLoad stepKey="waitForPageToLoad11"/>
163-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
164-
192+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInSecondPage3"/>
165193
<!--Select First Page using page number-->
194+
<comment userInput="Select First Page using page number" stepKey="commentSelectFirstPageSecondTime"/>
166195
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
167196
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
168197
<waitForPageLoad stepKey="waitForPageToLoad13"/>
169-
170-
<!--Select 30 items per page and verify number of products displayed in each page -->
198+
<!--Select 36 items per page and verify number of products displayed in each page -->
199+
<comment userInput="Select 36 items per page and verify number of products displayed in each page" stepKey="commentSelect36ItemsPerPage"/>
171200
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
172-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
201+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="36" stepKey="selectPerPageOption2"/>
173202
<waitForPageLoad stepKey="waitForPageToLoad12"/>
174-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
203+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="30" stepKey="seeNumberOfProductsInFirstPage4"/>
175204
</test>
176205
</tests>

0 commit comments

Comments
 (0)