Skip to content

Commit 3fd8742

Browse files
eugene-petroveugene-petrov
committed
MC-15341: Default product numbers to display results in poor display on Desktop
- Fixes of failed tests
1 parent b804f9f commit 3fd8742

File tree

3 files changed

+44
-22
lines changed

3 files changed

+44
-22
lines changed

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

Lines changed: 42 additions & 20 deletions
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,6 +77,16 @@
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>
7292

@@ -86,11 +106,13 @@
86106
<waitForElementVisible selector="{{CatalogProductsSection.resetFilter}}" time="30" stepKey="waitForResetButtonToVisible"/>
87107
<click selector="{{CatalogProductsSection.resetFilter}}" stepKey="clickOnResetFilter"/>
88108
<waitForPageLoad stepKey="waitForPageToLoad3"/>
89-
<selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="20" stepKey="selectPagePerView"/>
109+
110+
<selectOption selector="{{AdminProductGridFilterSection.productPerPage}}" userInput="30" stepKey="selectPagePerView"/>
111+
<wait stepKey="waitFroPageToLoad1" time="30"/>
90112
<fillField selector="{{AdminCategoryContentSection.productTableColumnName}}" userInput="pagi" stepKey="selectProduct1"/>
91113
<click selector="{{AdminCategoryContentSection.productSearch}}" stepKey="clickSearchButton"/>
92-
<waitForPageLoad stepKey="waitFroPageToLoad1"/>
93-
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="20" stepKey="seeNumberOfProductsFound"/>
114+
<waitForPageLoad stepKey="waitFroPageToLoad2"/>
115+
<see selector="{{AdminProductGridFilterSection.productCount}}" userInput="30" stepKey="seeNumberOfProductsFound"/>
94116
<click selector="{{AdminCategoryProductsGridSection.productSelectAll}}" stepKey="selectSelectAll"/>
95117
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickSaveButton"/>
96118
<waitForPageLoad stepKey="waitForCategorySaved"/>
@@ -104,73 +126,73 @@
104126
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName(_defaultCategory.name)}}" stepKey="selectCategory"/>
105127
<waitForPageLoad stepKey="waitForProductToLoad"/>
106128

107-
<!--Select 9 items per page and verify number of products displayed in each page -->
129+
<!--Select 12 items per page and verify number of products displayed in each page -->
108130
<conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
109131
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
110-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="9" stepKey="selectPerPageOption"/>
132+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="12" stepKey="selectPerPageOption"/>
111133

112134
<!--Verify number of products displayed in First Page -->
113-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage"/>
135+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
114136

115137
<!--Verify number of products displayed in Second Page -->
116138
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
117139
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
118140
<waitForPageLoad stepKey="waitForPageToLoad4"/>
119-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage"/>
141+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage"/>
120142

121143
<!--Verify number of products displayed in third Page -->
122144
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
123145
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
124146
<waitForPageLoad stepKey="waitForPageToLoad2"/>
125-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage"/>
147+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage"/>
126148

127149
<!--Change Pages using Previous Page selector and verify number of products displayed in each page-->
128150
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage"/>
129151
<click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage1"/>
130152
<waitForPageLoad stepKey="waitForPageToLoad5"/>
131-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage1"/>
153+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage1"/>
132154
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage1"/>
133155
<click selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="clickOnPreviousPage2"/>
134156
<waitForPageLoad stepKey="waitForPageToLoad6"/>
135-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInFirstPage1"/>
157+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage1"/>
136158

137159
<!--Select Pages by using page Number and verify number of products displayed-->
138160
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage2"/>
139161
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('2')}}" stepKey="clickOnPage2"/>
140162
<waitForPageLoad stepKey="waitForPageToLoad7"/>
141-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsInSecondPage2"/>
163+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage2"/>
142164

143165
<!--Select Third Page using page number-->
144166
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToPreviousPage3"/>
145167
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('3')}}" stepKey="clickOnThirdPage"/>
146168
<waitForPageLoad stepKey="waitForPageToLoad8"/>
147-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="2" stepKey="seeNumberOfProductsInThirdPage2"/>
169+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage2"/>
148170

149171
<!--Select First Page using page number-->
150172
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
151173
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
152174
<waitForPageLoad stepKey="waitForPageToLoad9"/>
153-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="9" stepKey="seeNumberOfProductsFirstPage2"/>
175+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsFirstPage2"/>
154176

155-
<!--Select 15 items per page and verify number of products displayed in each page -->
177+
<!--Select 24 items per page and verify number of products displayed in each page -->
156178
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
157-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="15" stepKey="selectPerPageOption1"/>
179+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="24" stepKey="selectPerPageOption1"/>
158180
<waitForPageLoad stepKey="waitForPageToLoad10"/>
159-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="15" stepKey="seeNumberOfProductsInFirstPage3"/>
181+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="24" stepKey="seeNumberOfProductsInFirstPage3"/>
160182
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
161183
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
162184
<waitForPageLoad stepKey="waitForPageToLoad11"/>
163-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="5" stepKey="seeNumberOfProductsInSecondPage3"/>
185+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInSecondPage3"/>
164186

165187
<!--Select First Page using page number-->
166188
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
167189
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
168190
<waitForPageLoad stepKey="waitForPageToLoad13"/>
169191

170-
<!--Select 30 items per page and verify number of products displayed in each page -->
192+
<!--Select 36 items per page and verify number of products displayed in each page -->
171193
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
172-
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="30" stepKey="selectPerPageOption2"/>
194+
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="36" stepKey="selectPerPageOption2"/>
173195
<waitForPageLoad stepKey="waitForPageToLoad12"/>
174-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="20" stepKey="seeNumberOfProductsInFirstPage4"/>
196+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="30" stepKey="seeNumberOfProductsInFirstPage4"/>
175197
</test>
176198
</tests>

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
130130
<waitForPageLoad stepKey="waitForPageLoad"/>
131131
<scrollTo selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="scrollToLimiter"/>
132-
<selectOption userInput="30" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
132+
<selectOption userInput="36" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
133133
<waitForPageLoad stepKey="waitForLoadProducts"/>
134134
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
135135

‎app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerIsAbsentTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<amOnPage url="{{StorefrontCategoryPage.url($$createCategory.name$$)}}" stepKey="onCategoryPage"/>
126126
<waitForPageLoad stepKey="waitForPageLoad"/>
127127
<scrollTo selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="scrollToLimiter"/>
128-
<selectOption userInput="30" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
128+
<selectOption userInput="36" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="selectLimitOnPage"/>
129129
<waitForPageLoad stepKey="waitForLoadProducts"/>
130130
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
131131

0 commit comments

Comments
 (0)