Skip to content

Commit fb84f15

Browse files
Usik2203Usik2203
committed
Replaced by action group
1 parent 1d1614b commit fb84f15

20 files changed

+93
-42
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@
3333
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
3434
<!--Create subcategory under parent category -->
3535
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
36-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}" stepKey="selectCategory"/>
37-
<waitForPageLoad stepKey="waitForPageToLoad"/>
36+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
37+
<argument name="category" value="$$createCategory.name$$"/>
38+
</actionGroup>
39+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
3840
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>
3941
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{SimpleSubCategory.name}}" stepKey="addSubCategoryName"/>
4042
<checkOption selector="{{AdminCategoryBasicFieldSection.EnableCategory}}" stepKey="enableCategory"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@
101101
<comment userInput="Open Category Page and select created category" stepKey="commentOpenCategoryPage"/>
102102
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
103103
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
104-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCreatedCategory"/>
105-
<waitForPageLoad stepKey="waitForPageToLoaded2"/>
104+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCreatedCategory">
105+
<argument name="category" value="{{_defaultCategory.name}}"/>
106+
</actionGroup>
107+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoaded2"/>
106108
<!--Select Products-->
107109
<comment userInput="Select Products" stepKey="commentSelectProducts"/>
108110
<scrollTo selector="{{AdminCategoryBasicFieldSection.productsInCategory}}" x="0" y="-80" stepKey="scrollToProductInCategory"/>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@
2323
</before>
2424
<after>
2525
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
26-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="clickCategoryLink"/>
26+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="clickCategoryLink">
27+
<argument name="category" value="{{FirstLevelSubCat.name}}"/>
28+
</actionGroup>
29+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCreatedCategory">
30+
<argument name="category" value="{{_defaultCategory.name}}"/>
31+
</actionGroup>
32+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoaded2"/>
2733
<click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="clickDelete"/>
2834
<waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForConfirmationModal"/>
2935
<see selector="{{AdminCategoryModalSection.message}}" userInput="Are you sure you want to delete this category?" stepKey="seeDeleteConfirmationMessage"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@
5555
<!-- Select created category and make category inactive-->
5656
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
5757
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
58-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(CatNotActive.name)}}" stepKey="selectCreatedCategory"/>
59-
<waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
58+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCreatedCategory">
59+
<argument name="category" value="{{CatNotActive.name}}"/>
60+
</actionGroup>
61+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForCategoryPageToLoad"/>
6062
<actionGroup ref="AdminSaveCategoryActionGroup" stepKey="saveSubCategory"/>
6163
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="seeSuccessMessage"/>
6264
<see selector="{{AdminCategoryContentSection.categoryPageTitle}}" userInput="{{CatNotActive.name}}" stepKey="seeUpdatedCategoryTitle"/>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory1">
5151
<argument name="categoryEntity" value="SimpleSubCategory"/>
5252
</actionGroup>
53-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name)}}" stepKey="clickOnCreatedNewRootCategory1"/>
53+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="clickOnCreatedNewRootCategory1">
54+
<argument name="category" value="{{NewRootCategory.name}}"/>
55+
</actionGroup>
5456
<scrollToTopOfPage stepKey="scrollToTopOfPage3"/>
5557
<!--Create another subcategory-->
5658
<actionGroup ref="CreateCategoryActionGroup" stepKey="createSubcategory2">

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage1"/>
4242
<scrollToTopOfPage stepKey="scrollToTopOfPage2"/>
4343
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="expandToSeeAllCategories"/>
44-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(NewRootCategory.name))}}" stepKey="clickRootCategoryInTree"/>
44+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="clickRootCategoryInTree">
45+
<argument name="category" value="{{NewRootCategory.name}}"/>
46+
</actionGroup>
4547

4648
<!--Verify Delete button is not displayed-->
4749
<dontSeeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="dontSeeDeleteButton"/>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@
101101
</after>
102102
<!-- Step 1-2: Open Category page and Set scope selector to All Store Views-->
103103
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="goToCategoryPage"/>
104-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
105-
stepKey="clickCategoryName"/>
104+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="clickCategoryName">
105+
<argument name="category" value="$$createCategory.name$$"/>
106+
</actionGroup>
106107
<click selector="{{AdminCategoryProductsSection.sectionHeader}}" stepKey="openProductSection"/>
107108
<grabTextFrom selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createCategory.name$$)}}"
108109
stepKey="grabTextFromCategory"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@
3131
<!--Open Category Page-->
3232
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
3333
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
34-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
35-
<waitForPageLoad stepKey="waitForPageToLoad"/>
34+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
35+
<argument name="category" value="{{_defaultCategory.name}}"/>
36+
</actionGroup>
37+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
3638

3739
<!--Enable Anchor for _defaultCategory Category-->
3840
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@
3535
<!--Open category page-->
3636
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
3737
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
38-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(FirstLevelSubCat.name)}}" stepKey="selectCategory"/>
39-
<waitForPageLoad stepKey="waitForPageToLoad"/>
38+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
39+
<argument name="category" value="{{FirstLevelSubCat.name}}"/>
40+
</actionGroup>
41+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
4042

4143
<!--Create second level category-->
4244
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategoryButton"/>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@
3434
<!--Open Category page-->
3535
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openAdminCategoryIndexPage"/>
3636
<actionGroup ref="AdminExpandCategoryTreeActionGroup" stepKey="clickOnExpandTree"/>
37-
<click selector="{{AdminCategorySidebarTreeSection.categoryInTree(_defaultCategory.name)}}" stepKey="selectCategory"/>
38-
<waitForPageLoad stepKey="waitForPageToLoad"/>
37+
<actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="selectCategory">
38+
<argument name="category" value="{{_defaultCategory.name}}"/>
39+
</actionGroup>
40+
<comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad"/>
3941

4042
<!--Enable Anchor for _defaultCategory category -->
4143
<scrollTo selector="{{CategoryDisplaySettingsSection.DisplaySettingTab}}" x="0" y="-80" stepKey="scrollToDisplaySetting"/>

0 commit comments

Comments
 (0)