Skip to content

Commit 77f1c5d

Browse files
shashikant.kumarshashikant.kumar
shashikant.kumar
authored and
shashikant.kumar
committed
xpath, element name, stepkeys modification
1 parent f6446c8 commit 77f1c5d

File tree

4 files changed

+82
-55
lines changed

4 files changed

+82
-55
lines changed

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminToggleAnchorSwitchActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<annotations>
1313
<description>Admin enable or disable Anchor Switch for any category.</description>
1414
</annotations>
15-
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting1"/>
16-
<click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting1"/>
15+
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>
16+
<click selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" stepKey="selectDisplaySetting"/>
1717
<click selector="{{AdminCategoryBasicFieldSection.anchorSwitch}}" stepKey="toggleSwitchAnchorCategory"/>
1818
<wait time="10" stepKey="waitToChangeAnchorSwitchStatus"/>
19-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveSubCategory1"/>
19+
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/>
2020
<magentoCLI command="indexer:reindex" stepKey="performReindex"/>
2121
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
2222
</actionGroup>

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@
2828
<element name="presenceProductsInCategory" type="text" selector="//div[@class='admin__data-grid-wrap admin__data-grid-wrap-static']//td[3]" timeout="30"/>
2929
<element name="anchorSwitch" type="input" selector="//input[@name='is_anchor']/../..//div[@class='admin__actions-switch']" timeout="30"/>
3030
<element name="categoryTreeForThree" type="input" selector="//span[contains(text(),'{{var1}}')]/../../..//ul//a//span[contains(text(),'{{var2}}')]/../../..//ul//a/span[contains(text(),'{{var3}}')]" parameterized="true"/>
31-
<element name="categoryTreeForFour" type="input" selector="//span[contains(text(),'{{CatA}}') and contains(text(),'(4)') ]/../../..//ul//a//span[contains(text(),'{{CatB}}') and contains(text(),'(1)')]/../../..//ul//a/span[contains(text(),'{{CatC}}') and contains(text(),'(1)')]/../../../../../..//li[2]//a/span[contains(text(),'{{CatD}}') and contains(text(),'(1)')]" parameterized="true"/>
32-
<element name="categoryTreeForFive" type="input" selector="//span[contains(text(),'{{CatA}}') and contains(text(),'(5)') ]/../../..//ul//a//span[contains(text(),'{{CatB}}') and contains(text(),'(1)')]/../../..//ul//a/span[contains(text(),'{{CatC}}') and contains(text(),'(1)')]/../../../../../..//li[2]//a/span[contains(text(),'{{CatD}}') and contains(text(),'(2)')]/.././../..//ul//a/span[contains(text(),'{{CatE}}') and contains(text(),'(1)')]" parameterized="true"/>
33-
<element name="dragSubCategory" type="text" selector="//div[@class='x-tree-node-el folder active-category x-tree-node-leaf x-tree-selected']//a/span[contains(text(),'{{var1}}')]" parameterized="true"/>
31+
<element name="categoryTreeForFour" type="input" selector="//span[contains(text(),'{{CatA}}') and contains(text(),'({{qty1}})') ]/../../..//ul//a//span[contains(text(),'{{CatB}}') and contains(text(),'({{qty2}})')]/../../..//ul//a/span[contains(text(),'{{CatC}}') and contains(text(),'({{qty3}})')]/../../../../../..//li[2]//a/span[contains(text(),'{{CatD}}') and contains(text(),'({{qty4}})')]" parameterized="true"/>
32+
<element name="categoryTreeForFive" type="input" selector="//span[contains(text(),'{{CatA}}') and contains(text(),'({{qty1}})') ]/../../..//ul//a//span[contains(text(),'{{CatB}}') and contains(text(),'({{qty2}})')]/../../..//ul//a/span[contains(text(),'{{CatC}}') and contains(text(),'({{qty3}})')]/../../../../../..//li[2]//a/span[contains(text(),'{{CatD}}') and contains(text(),'({{qty4}})')]/.././../..//ul//a/span[contains(text(),'{{CatE}}') and contains(text(),'({{qty5}})')]" parameterized="true"/>
33+
<element name="sourceCategory" type="text" selector="//div[@class='x-tree-node-el folder active-category x-tree-node-leaf x-tree-selected']//a/span[contains(text(),'{{var1}}')]" parameterized="true"/>
34+
<element name="destinationCategory" type="text" selector="//div[@class='x-tree-node-el folder active-category x-tree-node-expanded']//a/span[contains(text(),'Default Category')]"/>
35+
3436
<element name="grabPopUpText" type="input" selector="//div[@class='modal-inner-wrap']//div[@data-id='information-dialog-category']//div[text()='This operation can take a long time']"/>
3537
<element name="acceptPopUp" type="input" selector="//div[@class='modal-inner-wrap']//button[@class='action-primary']/span[text()='Ok']"/>
3638
</section>

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

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,29 @@
1717
<testCaseId value="AC-4114"/>
1818
</annotations>
1919
<before>
20-
<createData entity="_defaultCategory" stepKey="createDefaultCategory"/>
21-
<createData entity="Two_nested_categories" stepKey="createTwoLevelNestedCategories">
22-
<requiredEntity createDataKey="createDefaultCategory"/>
20+
<createData entity="_defaultCategory" stepKey="createTestCategory"/>
21+
<createData entity="Two_nested_categories" stepKey="createSubTestCategory">
22+
<requiredEntity createDataKey="createTestCategory"/>
2323
</createData>
2424
<createData entity="SimpleProductQty100" stepKey="createFirstSimpleProduct">
25-
<requiredEntity createDataKey="createDefaultCategory"/>
25+
<requiredEntity createDataKey="createTestCategory"/>
2626
<field key="name">Simple1</field>
2727
<field key="price">90</field>
2828
</createData>
2929
<createData entity="ApiSimpleProduct" stepKey="createSecondSimpleProduct">
30-
<requiredEntity createDataKey="createTwoLevelNestedCategories"/>
30+
<requiredEntity createDataKey="createSubTestCategory"/>
3131
<field key="name">Simple2</field>
3232
<field key="price">10</field>
3333
</createData>
3434
</before>
3535
<after>
3636
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstProduct"/>
3737
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondProduct"/>
38-
<deleteData createDataKey="createTwoLevelNestedCategories" stepKey="deleteSubCategory"/>
39-
<deleteData createDataKey="createDefaultCategory" stepKey="deleteMainCategory"/>
38+
<deleteData createDataKey="createSubTestCategory" stepKey="deleteSubCategory"/>
39+
<deleteData createDataKey="createTestCategory" stepKey="deleteMainCategory"/>
4040
</after>
4141
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
42-
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
42+
<argument name="categoryName" value="$$createTestCategory.name$$"/>
4343
</actionGroup>
4444
<see userInput="2" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCountFirstTime"/>
4545
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeFirstSimpleProductNameOnCategoryPage">
@@ -55,70 +55,73 @@
5555
<argument name="minPrice2" value="90.00"/>
5656
<argument name="maxPrice2" value=" and above"/>
5757
</actionGroup>
58+
5859
<!--Goto Category in admin side and do validation for single Product visibility validation-->
5960
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
6061
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openAdminCategoryPage"/>
6162
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters"/>
6263
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
63-
<argument name="categoryName" value="$createDefaultCategory.name$"/>
64+
<argument name="categoryName" value="$createTestCategory.name$"/>
6465
</actionGroup>
6566
<actionGroup ref="AdminCategoryPageOpenProductsInCategorySectionActionGroup" stepKey="clickAdminCategoryProductSection"/>
66-
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSectionHeaderToLoad"/>
6767
<see userInput="$$createFirstSimpleProduct.name$$" selector="{{AdminCategoryBasicFieldSection.presenceProductsInCategory}}" stepKey="seeSingleProduct"/>
6868
<dontSee selector="{{AdminCategoryProductsGridSection.productGridNameProduct($$createSecondSimpleProduct.name$$)}}"
6969
userInput="$$createSecondSimpleProduct.name$$" stepKey="doNotSeeSecondProduct"/>
70+
7071
<!--Disable anchor Category and do validation for Product and Layered Navigation on StoreFront-->
7172
<actionGroup ref="AdminToggleAnchorSwitchActionGroup" stepKey="disableAnchorSwitch"/>
7273
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage"/>
7374
<actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="goToHomePage"/>
74-
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createDefaultCategory.name$$)}}" stepKey="cartClickCategory"/>
75-
<seeInTitle userInput="$$createDefaultCategory.name$$" stepKey="assertCategoryNameInTitle"/>
76-
<see userInput="$$createDefaultCategory.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
75+
<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createTestCategory.name$$)}}" stepKey="cartClickCategory"/>
76+
<seeInTitle userInput="$$createTestCategory.name$$" stepKey="assertCategoryNameInTitle"/>
77+
<see userInput="$$createTestCategory.name$$" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
7778
<see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount"/>
7879
<seeElement selector="{{StorefrontCategoryProductSection.listedProduct('1')}}" stepKey="assertSimpleProductPresence"/>
7980
<see userInput="$$createFirstSimpleProduct.name$$" selector="{{StorefrontCategoryProductSection.ProductTitleByNumber('1')}}" stepKey="checkTitle"/>
8081
<see userInput="$90.00" selector="{{StorefrontCategoryProductSection.ProductPriceByNumber('1')}}" stepKey="checkPrice"/>
81-
<seeElement selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createTwoLevelNestedCategories.name$$)}}" stepKey="verifyShopByCatLayeredNavigation"/>
82+
<seeElement selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createSubTestCategory.name$$)}}" stepKey="verifyShopByCatLayeredNavigation"/>
83+
8284
<!--Enable anchor Category and do validation for Product and Layered Navigation on StoreFront-->
83-
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openAdminCategoryPage1"/>
84-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters1"/>
85-
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem1">
86-
<argument name="categoryName" value="$createDefaultCategory.name$"/>
85+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openAdminCategoryPage2ndTime"/>
86+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters2ndTime"/>
87+
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem2ndTime">
88+
<argument name="categoryName" value="$createTestCategory.name$"/>
8789
</actionGroup>
8890
<actionGroup ref="AdminToggleAnchorSwitchActionGroup" stepKey="enableAnchorSwitch"/>
89-
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage1"/>
90-
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage1">
91-
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
91+
<actionGroup ref="AssertAdminCategorySaveSuccessMessageActionGroup" stepKey="seeSuccessMessage2ndTime"/>
92+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage2ndTime">
93+
<argument name="categoryName" value="$$createTestCategory.name$$"/>
9294
</actionGroup>
93-
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeFirstSimpleProductNameOnCategoryPage1">
95+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeFirstSimpleProductNameOnCategoryPage2ndTime">
9496
<argument name="productName" value="$$createFirstSimpleProduct.name$$"/>
9597
</actionGroup>
96-
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeSecondSimpleProductNameOnCategoryPage1">
98+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeSecondSimpleProductNameOnCategoryPage2ndTime">
9799
<argument name="productName" value="$$createSecondSimpleProduct.name$$"/>
98100
</actionGroup>
99-
<actionGroup ref="AssertStorefrontLayeredNavigationCategoryAndPriceActionGroup" stepKey="checkCategoryAndPriceFilterIsPresent1">
101+
<actionGroup ref="AssertStorefrontLayeredNavigationCategoryAndPriceActionGroup" stepKey="checkCategoryAndPriceFilterIsPresent2ndTime">
100102
<argument name="minPrice" value="10.00"/>
101103
<argument name="maxPrice" value="19.99"/>
102104
<argument name="count" value="1"/>
103105
<argument name="minPrice2" value="90.00"/>
104106
<argument name="maxPrice2" value=" and above"/>
105107
</actionGroup>
108+
106109
<!-- Drag drop Category and do Validation for Category and Products on StoreFront-->
107-
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openAdminCategoryPage2"/>
108-
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters2"/>
109-
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem2">
110-
<argument name="categoryName" value="$createTwoLevelNestedCategories.name$"/>
110+
<actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openAdminCategoryPage3rdTime"/>
111+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters3rdTime"/>
112+
<actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem3rdTime">
113+
<argument name="categoryName" value="$createSubTestCategory.name$"/>
111114
</actionGroup>
112115
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandCategoryTree"/>
113116
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements">
114-
<argument name="parentCategoryName" value="$createDefaultCategory.name$"/>
115-
<argument name="childCategoryName" value="$createTwoLevelNestedCategories.name$"/>
117+
<argument name="parentCategoryName" value="$createTestCategory.name$"/>
118+
<argument name="childCategoryName" value="$createSubTestCategory.name$"/>
116119
</actionGroup>
117-
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements2">
120+
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements3rdTime">
118121
<argument name="parentCategoryName" value="Default Category"/>
119-
<argument name="childCategoryName" value="$createDefaultCategory.name$"/>
122+
<argument name="childCategoryName" value="$createTestCategory.name$"/>
120123
</actionGroup>
121-
<dragAndDrop selector1="{{AdminCategoryBasicFieldSection.dragSubCategory($createTwoLevelNestedCategories.name$)}}" selector2="//div[@class='x-tree-node-el folder active-category x-tree-node-expanded']//a/span[contains(text(),'Default Category')]" stepKey="dragAndDrop"/>
124+
<dragAndDrop selector1="{{AdminCategoryBasicFieldSection.sourceCategory($createSubTestCategory.name$)}}" selector2="{{AdminCategoryBasicFieldSection.destinationCategory}}" stepKey="dragAndDrop"/>
122125
<wait time="10" stepKey="waitForPopUpToLoad"/>
123126
<grabTextFrom selector="{{AdminCategoryBasicFieldSection.grabPopUpText}}" stepKey="grabTextPopUp"/>
124127
<assertStringContainsString stepKey="assertDropDownTierPriceTextProduct1">
@@ -129,30 +132,30 @@
129132
<wait time="10" stepKey="waitCategoryTreeToLoad"/>
130133
<magentoCLI command="indexer:reindex" stepKey="performReindex"/>
131134
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
132-
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements3">
135+
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements4thTime">
133136
<argument name="parentCategoryName" value="Default Category"/>
134-
<argument name="childCategoryName" value="$createTwoLevelNestedCategories.name$"/>
137+
<argument name="childCategoryName" value="$createSubTestCategory.name$"/>
135138
</actionGroup>
136-
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements4">
139+
<actionGroup ref="AdminAssertParentChildCategoryTreeElementsActionGroup" stepKey="assertParentChildCategoryTreeElements5thTime">
137140
<argument name="parentCategoryName" value="Default Category"/>
138-
<argument name="childCategoryName" value="$createDefaultCategory.name$"/>
141+
<argument name="childCategoryName" value="$createTestCategory.name$"/>
139142
</actionGroup>
140-
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage2">
141-
<argument name="categoryName" value="$$createDefaultCategory.name$$"/>
143+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage3rdTime">
144+
<argument name="categoryName" value="$$createTestCategory.name$$"/>
142145
</actionGroup>
143-
<see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount2"/>
144-
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeFirstSimpleProductNameOnCategoryPage2">
146+
<see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount3rdTime"/>
147+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeFirstSimpleProductNameOnCategoryPage3rdTime">
145148
<argument name="productName" value="$$createFirstSimpleProduct.name$$"/>
146149
</actionGroup>
147-
<dontSee selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createTwoLevelNestedCategories.name$$)}}" stepKey="verifyShopByCatLayeredNavigation2"/>
148-
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage3">
149-
<argument name="categoryName" value="$$createTwoLevelNestedCategories.name$$"/>
150+
<dontSee selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createSubTestCategory.name$$)}}" stepKey="verifyShopByCatLayeredNavigation3rdTime"/>
151+
<actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage4thTime">
152+
<argument name="categoryName" value="$$createSubTestCategory.name$$"/>
150153
</actionGroup>
151-
<see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount3"/>
152-
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeSecondSimpleProductNameOnCategoryPage2">
154+
<see userInput="1" selector="{{StorefrontCategoryMainSection.productCount}} span" stepKey="assertProductCount4thTime"/>
155+
<actionGroup ref="AssertStorefrontProductIsPresentOnCategoryPageActionGroup" stepKey="seeSecondSimpleProductNameOnCategoryPage3rdTime">
153156
<argument name="productName" value="$$createSecondSimpleProduct.name$$"/>
154157
</actionGroup>
155-
<dontSee selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createTwoLevelNestedCategories.name$$)}}" stepKey="verifyShopByCatLayeredNavigation3"/>
158+
<dontSee selector="{{StorefrontCategorySidebarSection.shopByCategoryLinkButton($$createSubTestCategory.name$$)}}" stepKey="verifyShopByCatLayeredNavigation4thTime"/>
156159
</test>
157160
</tests>
158161

0 commit comments

Comments
 (0)