AC-8379: Functional test fixes

Author: nishant04412

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

@@ -20,8 +20,8 @@
         <click selector="{{AdminNewWidgetSection.selectCategory}}" stepKey="clickOnSelectCategory"/>
         <waitForPageLoad stepKey="waitForCategoryTreeLoaded"/>
         <click selector="{{AdminCategorySidebarTreeSection.expandRootCategoryByName(DefaultCategory.name)}}" stepKey="clickToExpandDefaultCategory"/>
-        <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="waitForCategoryVisible"/>
-        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree(categoryName)}}" stepKey="selectCategory"/>
+        <waitForElementVisible selector="{{WidgetSection.PreSelectCategory(categoryName)}}" stepKey="waitForCategoryVisible"/>
+        <click selector="{{WidgetSection.PreSelectCategory(categoryName)}}" stepKey="selectCategory"/>
         <waitForPageLoad stepKey="waitForWidgetPageLoaded"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveButton"/>
         <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminCategorySidebarTreeSection.xml

@@ -20,9 +20,9 @@
         <element name="lastCreatedCategory" type="block" selector=".x-tree-root-ct li li:last-child" />
         <element name="treeContainer" type="block" selector=".tree-holder" />
         <element name="expandRootCategory" type="text" selector="img.x-tree-elbow-end-plus"/>
-        <element name="expandRootCategoryByName" type="button" selector="//div[@class='x-tree-root-node']/li/div/a/span[contains(., '{{categoryName}}')]/../../img[contains(@class, 'x-tree-elbow-end-plus')]" parameterized="true" timeout="30"/>
+        <element name="expandRootCategoryByName" type="button" selector="//a[contains(text(),'{{categoryName}}')]/ancestor::li[contains(@class,'jstree-node')]//i[contains(@class,'jstree-ocl')]" parameterized="true" timeout="30"/>
         <element name="categoryByName" type="text" selector="//div[contains(@class, 'categories-side-col')]//a/span[contains(text(), '{{categoryName}}')]" parameterized="true" timeout="30"/>
-        <element name="expandCategoryByName" type="text" selector="//span[contains(text(),'{{categoryName}}')]/ancestor::div[contains(@class,'x-tree-node-el')]//img[contains(@class,'x-tree-elbow-end-plus') or contains(@class,'x-tree-elbow-plus')]" parameterized="true" timeout="30"/>
+        <element name="expandCategoryByName" type="text" selector="//a[contains(text(),'{{categoryName}}')]/ancestor::li[contains(@class,'jstree-node')]//i[contains(@class,'jstree-ocl')]" parameterized="true" timeout="30"/>
         <element name="subCategoryProductCount" type="text" selector="//div[@class='tree-holder']//span[contains(text(),'SubCat') and contains(text(),'({{productCount}})')]" parameterized="true"/>
         <element name="defaultCategoryProductCount" type="text" selector="//div[@class='tree-holder']//span[contains(text(),'Default Category') and contains(text(),'({{productCount}})')]" parameterized="true"/>
     </section>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminUpdateWidgetsOfCatalogCategoryLinkActionGroup.xml

@@ -22,6 +22,7 @@
         <click selector="{{CmsNewWidgetOptionsSection.SelectCategory}}" stepKey="clickSelectCategoryButton1"/>
         <waitForPageLoad stepKey="waitToLoadRootCategory"/>
         <click selector="{{CmsNewWidgetOptionsSection.ExpandRootCategory}}" stepKey="clickToExpandRootCat"/>
+        <waitForPageLoad stepKey="waitToExpandRootCategory"/>
         <click selector="{{CmsNewWidgetOptionsSection.SecondCategory}}" stepKey="clickSecondCategoryToSelect"/>
         <waitForPageLoad stepKey="waitToSelectSecondCategory"/>
         <click selector="{{CmsNewWidgetOptionsSection.SaveWidget}}" stepKey="clickSaveWidgetButton"/>

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

@@ -16,9 +16,9 @@
         <element name="SecondProduct" type="text" selector="//div[@class='admin__data-grid-wrap admin__data-grid-wrap-static']//tbody/tr[2]"/>
         <element name="SaveWidget" type="button" selector="//button[@id='save']"/>
         <element name="FirstWidget" type="text" selector="//tbody/tr[1]/td[3]"/>
-        <element name="ExpandRootCategory" type="button" selector="//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']"/>
-        <element name="FirstCategory" type="text" selector="//Span[contains(text(),'simpleCategory')]"/>
-        <element name="SecondCategory" type="text" selector="//Span[contains(text(),'CategoryB')]"/>
+        <element name="ExpandRootCategory" type="button" selector="//li[contains(@class,'jstree-node  jstree-closed')]//i[contains(@class,'jstree-icon jstree-ocl')]"/>
+        <element name="FirstCategory" type="text" selector="//a[contains(text(),'simpleCategory')]/../..//a"/>
+        <element name="SecondCategory" type="text" selector="//a[contains(text(),'CategoryB')]"/>
     </section>
 </sections>
 

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

@@ -14,7 +14,7 @@
         <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="BranchCat" type="button" selector="//a/span[contains(text(),'{{var}}')]/../..//img[@class='x-tree-ec-icon x-tree-elbow-end-plus']" parameterized="true"/>
-        <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']"/>
+        <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']"/>
     </section>
 </sections>

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

@@ -25,6 +25,7 @@
         <element name="CMSPage" type="text" selector="//td[contains(text(),'Home page')]"/>
         <element name="BlockPage" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="PreCreateCategory" type="text" selector=" //span[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="PreSelectCategory" type="text" selector=" //a[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="PreCreateProduct" type="text" selector="//td[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="NoOfProductToDisplay" type="input" selector="input[data-ui-id='wysiwyg-widget-options-fieldset-element-text-parameters-products-count']"/>
         <element name="AddParam" type="button" selector=".rule-param-add"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml

@@ -46,9 +46,9 @@
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectCategoryBtn" />
         <waitForPageLoad stepKey="wait3"/>
         <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" stepKey="waitForDefaultCategory"/>
-        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" dependentSelector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" visible="false" stepKey="expandRootCategory"/>
-        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
-        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" dependentSelector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" visible="false" stepKey="expandRootCategory"/>
+        <waitForElementVisible selector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
+        <click selector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCreateCategory" />
         <waitForElementNotVisible selector="{{WidgetSection.SelectCategoryTitle}}" stepKey="waitForSlideoutCloses1" />
         <actionGroup ref="AdminClickInsertWidgetActionGroup" stepKey="clickInsertWidget"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForSlideOutCloses2"/>

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml

@@ -50,9 +50,9 @@
         <click selector="{{WidgetSection.BtnChooser}}" stepKey="clickSelectPageBtn" />
         <waitForPageLoad stepKey="wait4"/>
         <waitForElementVisible selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" stepKey="waitForDefaultCategory"/>
-        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" dependentSelector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" visible="false" stepKey="expandRootCategory"/>
-        <waitForElementVisible selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
-        <click selector="{{WidgetSection.PreCreateCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
+        <conditionalClick selector="{{AdminCategorySidebarTreeSection.expandCategoryByName('Default Category')}}" dependentSelector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" visible="false" stepKey="expandRootCategory"/>
+        <waitForElementVisible selector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" stepKey="expandWait" />
+        <click selector="{{WidgetSection.PreSelectCategory('$$createPreReqCategory.name$$')}}" stepKey="selectPreCategory" />
         <waitForLoadingMaskToDisappear stepKey="waitLoadingMask" />
         <click selector="{{WidgetSection.PreCreateProduct('$$createPreReqProduct.name$$')}}" stepKey="selectPreProduct" />
         <waitForElementNotVisible selector="{{WidgetSection.SelectProductTitle}}" stepKey="waitForSlideOutCloses" />