Skip to content

Commit 89bc078

Browse files
zakdmazakdma
authored
Merge pull request #5526 from magento-tsg/2.4-develop-pr27
[TSG] TESTs Fixes for 2.4 (pr27) (2.4-develop)
2 parents 1116437 + 4c717f0 commit 89bc078

File tree

1 file changed

+50
-69
lines changed

1 file changed

+50
-69
lines changed

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

Lines changed: 50 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<testCaseId value="MC-30209"/>
1717
<severity value="CRITICAL"/>
1818
<group value="Catalog"/>
19+
<group value="SearchEngineElasticsearch"/>
1920
</annotations>
21+
2022
<before>
21-
<!-- Login Admin -->
22-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2323
<!--Create Category and Simple Products-->
2424
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
2525
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
@@ -64,51 +64,39 @@
6464
<createData entity="SimpleProduct" stepKey="createSimpleProduct14">
6565
<requiredEntity createDataKey="createCategory1"/>
6666
</createData>
67-
6867
<createData entity="SimpleProduct" stepKey="createSimpleProduct15">
6968
<requiredEntity createDataKey="createCategory1"/>
7069
</createData>
71-
7270
<createData entity="SimpleProduct" stepKey="createSimpleProduct16">
7371
<requiredEntity createDataKey="createCategory1"/>
7472
</createData>
75-
7673
<createData entity="SimpleProduct" stepKey="createSimpleProduct17">
7774
<requiredEntity createDataKey="createCategory1"/>
7875
</createData>
79-
8076
<createData entity="SimpleProduct" stepKey="createSimpleProduct18">
8177
<requiredEntity createDataKey="createCategory1"/>
8278
</createData>
83-
8479
<createData entity="SimpleProduct" stepKey="createSimpleProduct19">
8580
<requiredEntity createDataKey="createCategory1"/>
8681
</createData>
87-
8882
<createData entity="SimpleProduct" stepKey="createSimpleProduct20">
8983
<requiredEntity createDataKey="createCategory1"/>
9084
</createData>
91-
9285
<createData entity="SimpleProduct" stepKey="createSimpleProduct21">
9386
<requiredEntity createDataKey="createCategory1"/>
9487
</createData>
95-
9688
<createData entity="SimpleProduct" stepKey="createSimpleProduct22">
9789
<requiredEntity createDataKey="createCategory1"/>
9890
</createData>
99-
10091
<createData entity="SimpleProduct" stepKey="createSimpleProduct23">
10192
<requiredEntity createDataKey="createCategory1"/>
10293
</createData>
103-
10494
<createData entity="SimpleProduct" stepKey="createSimpleProduct24">
10595
<requiredEntity createDataKey="createCategory1"/>
10696
</createData>
107-
10897
<createData entity="SimpleProduct" stepKey="createSimpleProduct25">
10998
<requiredEntity createDataKey="createCategory1"/>
11099
</createData>
111-
112100
<createData entity="SimpleProduct" stepKey="createSimpleProduct26">
113101
<requiredEntity createDataKey="createCategory1"/>
114102
</createData>
@@ -118,79 +106,72 @@
118106
<createData entity="SimpleProduct" stepKey="createSimpleProduct28">
119107
<requiredEntity createDataKey="createCategory1"/>
120108
</createData>
121-
122109
<createData entity="SimpleProduct" stepKey="createSimpleProduct29">
123110
<requiredEntity createDataKey="createCategory1"/>
124111
</createData>
125112
<createData entity="SimpleProduct" stepKey="createSimpleProduct30">
126113
<requiredEntity createDataKey="createCategory1"/>
127114
</createData>
128115

129-
<!--Enable ElasticSearch as search engine.-->
130-
<magentoCLI command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}" stepKey="enableElasticSearchAsSearchEngine"/>
131-
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchEnable"/>
132-
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchEnable"/>
133-
116+
<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
117+
<magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="performReindex"/>
118+
<magentoCLI command="cache:clean" arguments="full_page" stepKey="cleanFullPageCache"/>
134119
</before>
135-
<after>
136-
<!--Delete created products, category -->
137-
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
138-
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
139-
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
140-
<deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
141-
<deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
142-
<deleteData createDataKey="createSimpleProduct5" stepKey="deleteSimpleProduct5"/>
143-
<deleteData createDataKey="createSimpleProduct6" stepKey="deleteSimpleProduct6"/>
144-
<deleteData createDataKey="createSimpleProduct7" stepKey="deleteSimpleProduct7"/>
145-
<deleteData createDataKey="createSimpleProduct8" stepKey="deleteSimpleProduct8"/>
146-
<deleteData createDataKey="createSimpleProduct9" stepKey="deleteSimpleProduct9"/>
147-
<deleteData createDataKey="createSimpleProduct10" stepKey="deleteSimpleProduct10"/>
148-
<deleteData createDataKey="createSimpleProduct11" stepKey="deleteSimpleProduct11"/>
149-
<deleteData createDataKey="createSimpleProduct12" stepKey="deleteSimpleProduct12"/>
150-
<deleteData createDataKey="createSimpleProduct13" stepKey="deleteSimpleProduct13"/>
151-
<deleteData createDataKey="createSimpleProduct14" stepKey="deleteSimpleProduct14"/>
152-
<deleteData createDataKey="createSimpleProduct15" stepKey="deleteSimpleProduct15"/>
153-
<deleteData createDataKey="createSimpleProduct16" stepKey="deleteSimpleProduct16"/>
154-
<deleteData createDataKey="createSimpleProduct17" stepKey="deleteSimpleProduct17"/>
155-
<deleteData createDataKey="createSimpleProduct18" stepKey="deleteSimpleProduct18"/>
156-
<deleteData createDataKey="createSimpleProduct19" stepKey="deleteSimpleProduct19"/>
157-
<deleteData createDataKey="createSimpleProduct20" stepKey="deleteSimpleProduct20"/>
158-
<deleteData createDataKey="createSimpleProduct21" stepKey="deleteSimpleProduct21"/>
159-
<deleteData createDataKey="createSimpleProduct22" stepKey="deleteSimpleProduct22"/>
160-
<deleteData createDataKey="createSimpleProduct23" stepKey="deleteSimpleProduct23"/>
161-
<deleteData createDataKey="createSimpleProduct24" stepKey="deleteSimpleProduct24"/>
162-
<deleteData createDataKey="createSimpleProduct25" stepKey="deleteSimpleProduct25"/>
163-
<deleteData createDataKey="createSimpleProduct26" stepKey="deleteSimpleProduct26"/>
164-
<deleteData createDataKey="createSimpleProduct27" stepKey="deleteSimpleProduct27"/>
165-
<deleteData createDataKey="createSimpleProduct28" stepKey="deleteSimpleProduct28"/>
166-
<deleteData createDataKey="createSimpleProduct29" stepKey="deleteSimpleProduct29"/>
167-
<deleteData createDataKey="createSimpleProduct30" stepKey="deleteSimpleProduct30"/>
168-
169120

170-
<!--Revert ElasticSearch as search engine.-->
171-
<actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
172-
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
173-
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
174-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
175-
</after>
121+
<after>
122+
<!--Delete created products, category -->
123+
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
124+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
125+
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
126+
<deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
127+
<deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
128+
<deleteData createDataKey="createSimpleProduct5" stepKey="deleteSimpleProduct5"/>
129+
<deleteData createDataKey="createSimpleProduct6" stepKey="deleteSimpleProduct6"/>
130+
<deleteData createDataKey="createSimpleProduct7" stepKey="deleteSimpleProduct7"/>
131+
<deleteData createDataKey="createSimpleProduct8" stepKey="deleteSimpleProduct8"/>
132+
<deleteData createDataKey="createSimpleProduct9" stepKey="deleteSimpleProduct9"/>
133+
<deleteData createDataKey="createSimpleProduct10" stepKey="deleteSimpleProduct10"/>
134+
<deleteData createDataKey="createSimpleProduct11" stepKey="deleteSimpleProduct11"/>
135+
<deleteData createDataKey="createSimpleProduct12" stepKey="deleteSimpleProduct12"/>
136+
<deleteData createDataKey="createSimpleProduct13" stepKey="deleteSimpleProduct13"/>
137+
<deleteData createDataKey="createSimpleProduct14" stepKey="deleteSimpleProduct14"/>
138+
<deleteData createDataKey="createSimpleProduct15" stepKey="deleteSimpleProduct15"/>
139+
<deleteData createDataKey="createSimpleProduct16" stepKey="deleteSimpleProduct16"/>
140+
<deleteData createDataKey="createSimpleProduct17" stepKey="deleteSimpleProduct17"/>
141+
<deleteData createDataKey="createSimpleProduct18" stepKey="deleteSimpleProduct18"/>
142+
<deleteData createDataKey="createSimpleProduct19" stepKey="deleteSimpleProduct19"/>
143+
<deleteData createDataKey="createSimpleProduct20" stepKey="deleteSimpleProduct20"/>
144+
<deleteData createDataKey="createSimpleProduct21" stepKey="deleteSimpleProduct21"/>
145+
<deleteData createDataKey="createSimpleProduct22" stepKey="deleteSimpleProduct22"/>
146+
<deleteData createDataKey="createSimpleProduct23" stepKey="deleteSimpleProduct23"/>
147+
<deleteData createDataKey="createSimpleProduct24" stepKey="deleteSimpleProduct24"/>
148+
<deleteData createDataKey="createSimpleProduct25" stepKey="deleteSimpleProduct25"/>
149+
<deleteData createDataKey="createSimpleProduct26" stepKey="deleteSimpleProduct26"/>
150+
<deleteData createDataKey="createSimpleProduct27" stepKey="deleteSimpleProduct27"/>
151+
<deleteData createDataKey="createSimpleProduct28" stepKey="deleteSimpleProduct28"/>
152+
<deleteData createDataKey="createSimpleProduct29" stepKey="deleteSimpleProduct29"/>
153+
<deleteData createDataKey="createSimpleProduct30" stepKey="deleteSimpleProduct30"/>
154+
</after>
176155

177156
<!--Open Storefront on the myCategory page-->
178-
<amOnPage url="/$$createCategory1.name$$.html" stepKey="GoToStorefrontCategory"/>
179-
<waitForPageLoad stepKey="waitForStorefrontCategoryPageLoad"/>
157+
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategory">
158+
<argument name="category" value="$createCategory1$"/>
159+
</actionGroup>
160+
<waitForPageLoad stepKey="waitForStorefrontCategoryPageLoad"/>
180161

181162
<!--Select 12 items per page and verify number of products displayed in each page -->
182163
<conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
183-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
164+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
184165
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="12" stepKey="selectPerPageOption"/>
185166
<!--Verify number of products displayed in First Page -->
186-
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
167+
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
187168
<!--Verify number of products displayed in Second Page -->
188-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
169+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
189170
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
190171
<waitForPageLoad stepKey="waitForPageToLoad4"/>
191172
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage"/>
192173
<!--Verify number of products displayed in third Page -->
193-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
174+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
194175
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
195176
<waitForPageLoad stepKey="waitForPageToLoad2"/>
196177
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage"/>
@@ -201,11 +182,11 @@
201182
<waitForPageLoad stepKey="waitForPageToLoad9"/>
202183
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsFirstPage2"/>
203184
<!--Select 24 items per page and verify number of products displayed in each page -->
204-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
185+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
205186
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="24" stepKey="selectPerPageOption1"/>
206187
<waitForPageLoad stepKey="waitForPageToLoad10"/>
207188
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="24" stepKey="seeNumberOfProductsInFirstPage3"/>
208-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
189+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
209190
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
210191
<waitForPageLoad stepKey="waitForPageToLoad11"/>
211192
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInSecondPage3"/>
@@ -214,7 +195,7 @@
214195
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
215196
<waitForPageLoad stepKey="waitForPageToLoad13"/>
216197
<!--Select 36 items per page and verify number of products displayed in each page -->
217-
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
198+
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
218199
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="36" stepKey="selectPerPageOption2"/>
219200
<waitForPageLoad stepKey="waitForPageToLoad12"/>
220201
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="30" stepKey="seeNumberOfProductsInFirstPage4"/>

0 commit comments

Comments
 (0)