AC-4948:- worked on review comment

Author: shashikant.kumar

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminOpenCreateNewWidgetsOfCMSStaticBlockActionGroup.xml

@@ -29,22 +29,22 @@
         <waitForPageLoad stepKey="waitForAddLayoutTabToLoad"/>
         <selectOption selector="{{CmsNewWidgetUpdateLayoutSection.DisplayOn}}" userInput="{{WidgetDisplayOn}}" stepKey="selectDisplay"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear3" />
-        <selectOption selector="//input[@id='specific_anchor_categories_0']" userInput="Specific Categories" stepKey="selectSpecificCategoryRadioButton"/>
-        <click selector="//*[@id='anchor_categories_ids_0']/p/a[1]/img" stepKey="clickCategoryChooserButton"/>
+        <selectOption selector="{{CmsNewWidgetUpdateLayoutSection.SpecificCategories}}" userInput="Specific Categories" stepKey="selectSpecificCategoryRadioButton"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.CategoryChooserButton}}" stepKey="clickCategoryChooserButton"/>
         <waitForPageLoad stepKey="waitForRootCategoryToLoad"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickRootCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.RootCat}}" stepKey="clickRootCat"/>
         <waitForPageLoad stepKey="waitForRootCategoryToExpand"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="clickFirstSubCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.FirstSubCat}}" stepKey="clickFirstSubCat"/>
         <waitForPageLoad stepKey="waitForFirstSubCatToExpand"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandSecondSubCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.SecondSubCat}}" stepKey="expandSecondSubCat"/>
         <waitForPageLoad stepKey="waitForSecondSubCatToExpand"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandThirdFirstSubCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.ThirdSubCat}}" stepKey="expandThirdFirstSubCat"/>
         <waitForPageLoad stepKey="waitForThirdSubCatToExpand"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFourthSubCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.FourthSubCat}}" stepKey="expandFourthSubCat"/>
         <waitForPageLoad stepKey="waitForFourthSubCatToExpand"/>
-        <click selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" stepKey="expandFifthSubCat"/>
+        <click selector="{{CmsNewWidgetUpdateLayoutSection.FifthSubCat}}" stepKey="expandFifthSubCat"/>
         <waitForPageLoad stepKey="waitForFifthSubCatToExpand"/>
-        <grabMultiple selector="//*[@class='x-tree-ec-icon x-tree-elbow-end-minus' or @class='x-tree-ec-icon x-tree-elbow-end']" stepKey="countNestedCategory"/>
+        <grabMultiple selector="{{CmsNewWidgetUpdateLayoutSection.CountAllNestedCat}}" stepKey="countNestedCategory"/>
         <assertCount stepKey="check">
             <expectedResult type="int">7</expectedResult>
             <actualResult type="variable">countNestedCategory</actualResult>

app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateAllNestedCategoryInWidget.xml renamed to app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateAllNestedCategoryInWidgetTest.xml

@@ -8,14 +8,13 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminValidateAllNestedCategoryInWidget">
+    <test name="AdminValidateAllNestedCategoryInWidgetTest">
         <annotations>
             <features value="Catalog"/>
             <stories value="All sub cat should shown"/>
             <title value="Category Selector limit category upto 5 from the root"/>
             <description value="Category Selector limit category more than 5 from the root"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MC-40114"/>
             <testCaseId value="AC-4948"/>
         </annotations>
         <before>

app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/CmsNewWidgetUpdateLayoutSection.xml

@@ -12,5 +12,14 @@
         <element name="DisplayOn" type="button" selector="#widget_instance\[0\]\[page_group\]"/>
         <element name="Container" type="button" selector="#all_pages_0 > table > tbody > tr > td:nth-child(1) > div > div > select"/>
         <element name="Template" type="button" selector="#all_pages_0 > table > tbody > tr > td:nth-child(2) > div > div > select"/>
+        <element name="SpecificCategories" type="button" selector="//input[@id='specific_anchor_categories_0']"/>
+        <element name="CategoryChooserButton" type="button" selector="//*[@id='anchor_categories_ids_0']/p/a[1]/img"/>
+        <element name="RootCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="FirstSubCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="SecondSubCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="ThirdSubCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="FourthSubCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="FifthSubCat" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
+        <element name="CountAllNestedCat" type="button" selector="//*[@class='x-tree-ec-icon x-tree-elbow-end-minus' or @class='x-tree-ec-icon x-tree-elbow-end']"/>
     </section>
 </sections>