Merge branch 'ACQE-7641' into ACQE-functional-deployment-v4

Author: Karishmathakare19

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

@@ -105,8 +105,13 @@
         </actionGroup>
 
         <!-- Check the total number of expanded categories in the category tree widget ensuring all of them are loaded. -->
-        <actionGroup ref="AdminAssertCategoryCountInCategoryTreeWidgetActionGroup" stepKey="checkCategoryCount">
-            <argument name="ExpectedCount" value="9"/>
-        </actionGroup>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createBaseCategory.name$$')}}" stepKey="waitForBaseCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelTwoCategory.name$$')}}" stepKey="waitForLevelTwoCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelThreeCategory.name$$')}}" stepKey="waitForLevelThreeCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFourCategory.name$$')}}" stepKey="waitForLevelFourCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveCategory.name$$')}}" stepKey="waitForLevelFiveCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelSixCategory.name$$')}}" stepKey="waitForLevelSixCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveSubCategory.name$$')}}" stepKey="waitForLevelFiveSubCategoryVisible"/>
+        <waitForElementVisible selector="{{CmsNewWidgetUpdateLayoutSection.CategoryName('$$createLevelFiveOneSubCategory.name$$')}}" stepKey="waitForLevelFiveOneSubCategoryVisible"/>
     </test>
 </tests>

app/code/Magento/Catalog/Test/Mftf/Test/AdminValidateMixedNestedCategoryInWidgetTest.xml

@@ -16,5 +16,6 @@
         <element name="CategoryChooserButton" type="button" selector="//*[@id='anchor_categories_ids_0']/p/a[1]/img"/>
         <element name="BranchCat" type="button" selector="//a[contains(text(),'{{var}}')]/..//i[contains(@class,'jstree-ocl')]" parameterized="true"/>
         <element name="CountAllNestedCat" type="button" selector="//*[@class='jstree-node jstree-last jstree-open' or @class='jstree-node  jstree-leaf jstree-last']//*[@class='jstree-icon jstree-ocl']"/>
+        <element name="CategoryName" type="text" selector="(//*[contains(@class, 'jstree-node') and contains(@class, 'jstree-last')])//a[contains(@class, 'jstree-anchor') and contains(normalize-space(text()), concat('{{CategoryName}}', ' '))]" parameterized="true"/>
     </section>
 </sections>