Skip to content

Commit e6d8a5a

Browse files
soumyausoumyau
authored
Merge pull request #252 from magento-pangolin/MQE-2105
MQE-2105: Test steps' merging order is not consistent
2 parents 187b8c6 + 1e7fedc commit e6d8a5a

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@
200200
<click selector="{{AdminGridMainControls.save}}" stepKey="clickToSaveProduct"/>
201201
<waitForPageLoad stepKey="waitForNewSimpleProductPage"/>
202202
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageThird"/>
203-
<!--TODO: REMOVE AFTER FIX MC-21717 -->
204-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
205-
<magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
203+
<magentoCron stepKey="runCronIndex" groups="index"/>
206204
</test>
207205
</tests>

‎app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminCheckResultsOfColorAndOtherFiltersTest">
10+
<test name="AdminCheckResultsOfColorAndOtherFiltersTest" insertAfter="runCronIndex">>
1111
<!-- Open a category on storefront -->
12-
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" after="flushCache" stepKey="goToCategoryPage">
12+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPage">
1313
<argument name="categoryName" value="$$createCategory.name$$"/>
1414
</actionGroup>
1515
<!-- Choose First attribute filter -->
16-
<waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" after="goToCategoryPage" stepKey="waitForCartRuleButton"/>
17-
<click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" after="waitForCartRuleButton" stepKey="expandFirstAttribute"/>
18-
<waitForPageLoad after="expandFirstAttribute" stepKey="waitForFilterLoad"/>
19-
<click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute.default_frontend_label$$','option2')}}" after="waitForFilterLoad" stepKey="expandFirstAttributeOption"/>
20-
<waitForPageLoad after="expandFirstAttributeOption" stepKey="waitForAttributeOption"/>
21-
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" after="waitForAttributeOption" stepKey="seeFirstProduct"/>
22-
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" after="seeFirstProduct" stepKey="seeSecondProduct"/>
23-
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createThirdConfigurableProduct.name$$)}}" after="seeSecondProduct" stepKey="seeSimpleProduct"/>
24-
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" after="seeSimpleProduct" stepKey="goToCategoryPageAgain">
16+
<waitForElementVisible selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" stepKey="waitForCartRuleButton"/>
17+
<click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute.default_frontend_label$$')}}" stepKey="expandFirstAttribute"/>
18+
<waitForPageLoad stepKey="waitForFilterLoad"/>
19+
<click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute.default_frontend_label$$','option2')}}" stepKey="expandFirstAttributeOption"/>
20+
<waitForPageLoad stepKey="waitForAttributeOption"/>
21+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" stepKey="seeFirstProduct"/>
22+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" stepKey="seeSecondProduct"/>
23+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createThirdConfigurableProduct.name$$)}}" stepKey="seeSimpleProduct"/>
24+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="goToCategoryPageAgain">
2525
<argument name="categoryName" value="$$createCategory.name$$"/>
2626
</actionGroup>
2727
<!-- Choose Second attribute filter -->
28-
<click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute2.default_frontend_label$$')}}" after="goToCategoryPageAgain" stepKey="expandSecondAttributeOption"/>
29-
<waitForPageLoad after="expandSecondAttributeOption" stepKey="waitForFilterPageLoad"/>
30-
<click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute2.default_frontend_label$$','option1')}}" after="waitForFilterPageLoad" stepKey="expandSecondAttribute"/>
31-
<waitForPageLoad after="expandSecondAttribute" stepKey="waitForProductListLoad"/>
32-
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" after="waitForProductListLoad" stepKey="seeFourthProduct"/>
33-
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" after="seeFourthProduct" stepKey="seeFifthProduct"/>
28+
<click selector="{{StorefrontCategorySidebarSection.filterOptionTitle('$$createConfigProductAttribute2.default_frontend_label$$')}}" stepKey="expandSecondAttributeOption"/>
29+
<waitForPageLoad stepKey="waitForFilterPageLoad"/>
30+
<click selector="{{LayeredNavigationSection.filterOptionContent('$$createConfigProductAttribute2.default_frontend_label$$','option1')}}" stepKey="expandSecondAttribute"/>
31+
<waitForPageLoad stepKey="waitForProductListLoad"/>
32+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createFirstConfigurableProduct.name$$)}}" stepKey="seeFourthProduct"/>
33+
<seeElement selector="{{StorefrontCategoryMainSection.specifiedProductItemInfo($$createSecondConfigurableProduct.name$$)}}" stepKey="seeFifthProduct"/>
3434
</test>
3535
</tests>

0 commit comments

Comments
 (0)