Skip to content

Commit

Permalink
Merge pull request #5526 from magento-tsg/2.4-develop-pr27
Browse files Browse the repository at this point in the history 
[TSG] TESTs Fixes for 2.4 (pr27) (2.4-develop)
  • Loading branch information
@zakdma
zakdma authored Apr 1, 2020
2 parents 1116437 + 4c717f0 commit 89bc078
Showing 1 changed file with 50 additions and 69 deletions.
119 changes: 50 additions & 69 deletions app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<testCaseId value="MC-30209"/>
<severity value="CRITICAL"/>
<group value="Catalog"/>
<group value="SearchEngineElasticsearch"/>
</annotations>

<before>
<!-- Login Admin -->
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
<!--Create Category and Simple Products-->
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
Expand Down Expand Up @@ -64,51 +64,39 @@
<createData entity="SimpleProduct" stepKey="createSimpleProduct14">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct15">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct16">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct17">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct18">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct19">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct20">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct21">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct22">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct23">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct24">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct25">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct26">
<requiredEntity createDataKey="createCategory1"/>
</createData>
Expand All @@ -118,79 +106,72 @@
<createData entity="SimpleProduct" stepKey="createSimpleProduct28">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<createData entity="SimpleProduct" stepKey="createSimpleProduct29">
<requiredEntity createDataKey="createCategory1"/>
</createData>
<createData entity="SimpleProduct" stepKey="createSimpleProduct30">
<requiredEntity createDataKey="createCategory1"/>
</createData>

<!--Enable ElasticSearch as search engine.-->
<magentoCLI command="config:set {{SearchEngineElasticsearchConfigData.path}} {{SearchEngineElasticsearchConfigData.value}}" stepKey="enableElasticSearchAsSearchEngine"/>
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchEnable"/>
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchEnable"/>

<actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
<magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="performReindex"/>
<magentoCLI command="cache:clean" arguments="full_page" stepKey="cleanFullPageCache"/>
</before>
<after>
<!--Delete created products, category -->
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
<deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
<deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
<deleteData createDataKey="createSimpleProduct5" stepKey="deleteSimpleProduct5"/>
<deleteData createDataKey="createSimpleProduct6" stepKey="deleteSimpleProduct6"/>
<deleteData createDataKey="createSimpleProduct7" stepKey="deleteSimpleProduct7"/>
<deleteData createDataKey="createSimpleProduct8" stepKey="deleteSimpleProduct8"/>
<deleteData createDataKey="createSimpleProduct9" stepKey="deleteSimpleProduct9"/>
<deleteData createDataKey="createSimpleProduct10" stepKey="deleteSimpleProduct10"/>
<deleteData createDataKey="createSimpleProduct11" stepKey="deleteSimpleProduct11"/>
<deleteData createDataKey="createSimpleProduct12" stepKey="deleteSimpleProduct12"/>
<deleteData createDataKey="createSimpleProduct13" stepKey="deleteSimpleProduct13"/>
<deleteData createDataKey="createSimpleProduct14" stepKey="deleteSimpleProduct14"/>
<deleteData createDataKey="createSimpleProduct15" stepKey="deleteSimpleProduct15"/>
<deleteData createDataKey="createSimpleProduct16" stepKey="deleteSimpleProduct16"/>
<deleteData createDataKey="createSimpleProduct17" stepKey="deleteSimpleProduct17"/>
<deleteData createDataKey="createSimpleProduct18" stepKey="deleteSimpleProduct18"/>
<deleteData createDataKey="createSimpleProduct19" stepKey="deleteSimpleProduct19"/>
<deleteData createDataKey="createSimpleProduct20" stepKey="deleteSimpleProduct20"/>
<deleteData createDataKey="createSimpleProduct21" stepKey="deleteSimpleProduct21"/>
<deleteData createDataKey="createSimpleProduct22" stepKey="deleteSimpleProduct22"/>
<deleteData createDataKey="createSimpleProduct23" stepKey="deleteSimpleProduct23"/>
<deleteData createDataKey="createSimpleProduct24" stepKey="deleteSimpleProduct24"/>
<deleteData createDataKey="createSimpleProduct25" stepKey="deleteSimpleProduct25"/>
<deleteData createDataKey="createSimpleProduct26" stepKey="deleteSimpleProduct26"/>
<deleteData createDataKey="createSimpleProduct27" stepKey="deleteSimpleProduct27"/>
<deleteData createDataKey="createSimpleProduct28" stepKey="deleteSimpleProduct28"/>
<deleteData createDataKey="createSimpleProduct29" stepKey="deleteSimpleProduct29"/>
<deleteData createDataKey="createSimpleProduct30" stepKey="deleteSimpleProduct30"/>


<!--Revert ElasticSearch as search engine.-->
<actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
</after>
<after>
<!--Delete created products, category -->
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
<deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
<deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
<deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
<deleteData createDataKey="createSimpleProduct5" stepKey="deleteSimpleProduct5"/>
<deleteData createDataKey="createSimpleProduct6" stepKey="deleteSimpleProduct6"/>
<deleteData createDataKey="createSimpleProduct7" stepKey="deleteSimpleProduct7"/>
<deleteData createDataKey="createSimpleProduct8" stepKey="deleteSimpleProduct8"/>
<deleteData createDataKey="createSimpleProduct9" stepKey="deleteSimpleProduct9"/>
<deleteData createDataKey="createSimpleProduct10" stepKey="deleteSimpleProduct10"/>
<deleteData createDataKey="createSimpleProduct11" stepKey="deleteSimpleProduct11"/>
<deleteData createDataKey="createSimpleProduct12" stepKey="deleteSimpleProduct12"/>
<deleteData createDataKey="createSimpleProduct13" stepKey="deleteSimpleProduct13"/>
<deleteData createDataKey="createSimpleProduct14" stepKey="deleteSimpleProduct14"/>
<deleteData createDataKey="createSimpleProduct15" stepKey="deleteSimpleProduct15"/>
<deleteData createDataKey="createSimpleProduct16" stepKey="deleteSimpleProduct16"/>
<deleteData createDataKey="createSimpleProduct17" stepKey="deleteSimpleProduct17"/>
<deleteData createDataKey="createSimpleProduct18" stepKey="deleteSimpleProduct18"/>
<deleteData createDataKey="createSimpleProduct19" stepKey="deleteSimpleProduct19"/>
<deleteData createDataKey="createSimpleProduct20" stepKey="deleteSimpleProduct20"/>
<deleteData createDataKey="createSimpleProduct21" stepKey="deleteSimpleProduct21"/>
<deleteData createDataKey="createSimpleProduct22" stepKey="deleteSimpleProduct22"/>
<deleteData createDataKey="createSimpleProduct23" stepKey="deleteSimpleProduct23"/>
<deleteData createDataKey="createSimpleProduct24" stepKey="deleteSimpleProduct24"/>
<deleteData createDataKey="createSimpleProduct25" stepKey="deleteSimpleProduct25"/>
<deleteData createDataKey="createSimpleProduct26" stepKey="deleteSimpleProduct26"/>
<deleteData createDataKey="createSimpleProduct27" stepKey="deleteSimpleProduct27"/>
<deleteData createDataKey="createSimpleProduct28" stepKey="deleteSimpleProduct28"/>
<deleteData createDataKey="createSimpleProduct29" stepKey="deleteSimpleProduct29"/>
<deleteData createDataKey="createSimpleProduct30" stepKey="deleteSimpleProduct30"/>
</after>

<!--Open Storefront on the myCategory page-->
<amOnPage url="/$$createCategory1.name$$.html" stepKey="GoToStorefrontCategory"/>
<waitForPageLoad stepKey="waitForStorefrontCategoryPageLoad"/>
<actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="goToStorefrontCategory">
<argument name="category" value="$createCategory1$"/>
</actionGroup>
<waitForPageLoad stepKey="waitForStorefrontCategoryPageLoad"/>

<!--Select 12 items per page and verify number of products displayed in each page -->
<conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="12" stepKey="selectPerPageOption"/>
<!--Verify number of products displayed in First Page -->
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
<!--Verify number of products displayed in Second Page -->
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
<waitForPageLoad stepKey="waitForPageToLoad4"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage"/>
<!--Verify number of products displayed in third Page -->
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
<waitForPageLoad stepKey="waitForPageToLoad2"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage"/>
Expand All @@ -201,11 +182,11 @@
<waitForPageLoad stepKey="waitForPageToLoad9"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsFirstPage2"/>
<!--Select 24 items per page and verify number of products displayed in each page -->
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="24" stepKey="selectPerPageOption1"/>
<waitForPageLoad stepKey="waitForPageToLoad10"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="24" stepKey="seeNumberOfProductsInFirstPage3"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
<click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
<waitForPageLoad stepKey="waitForPageToLoad11"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInSecondPage3"/>
Expand All @@ -214,7 +195,7 @@
<click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
<waitForPageLoad stepKey="waitForPageToLoad13"/>
<!--Select 36 items per page and verify number of products displayed in each page -->
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
<scrollTo selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
<selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="36" stepKey="selectPerPageOption2"/>
<waitForPageLoad stepKey="waitForPageToLoad12"/>
<seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="30" stepKey="seeNumberOfProductsInFirstPage4"/>
Expand Down

0 comments on commit 89bc078

Please sign in to comment.