Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into ACP2E-2629

Author: alzota

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.CreateCategory(categoryName)}}" stepKey="waitForCategoryVisible"/>
+        <click selector="{{WidgetSection.CreateCategory(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/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml

@@ -6,7 +6,7 @@
   */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCategoryBasicFieldSection">
         <element name="IncludeInMenu" type="checkbox" selector="input[name='include_in_menu']"/>
         <element name="includeInMenuLabel" type="text" selector="input[name='include_in_menu']+label"/>
@@ -27,12 +27,11 @@
         <element name="urlExistsErrorMessage" type="text" selector="//div[@class='message message-error error']//h4[contains(text(),'The value specified in the URL Key field would generate a URL that already exists.')]" timeout="30"/>
         <element name="presenceProductsInCategory" type="text" selector="//div[@class='admin__data-grid-wrap admin__data-grid-wrap-static']//td[3]" timeout="30"/>
         <element name="anchorSwitch" type="input" selector="//input[@name='is_anchor']/../..//div[@class='admin__actions-switch']" timeout="30"/>
-        <element name="categoryTreeForThree" type="input" selector="//span[contains(text(),'{{var1}}')]/../../..//ul//a//span[contains(text(),'{{var2}}')]/../../..//ul//a/span[contains(text(),'{{var3}}')]" parameterized="true"/>
-        <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"/>
-        <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"/>
-        <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"/>
-        <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')]"/>
-
+        <element name="categoryTreeForThree" type="input" selector="//a[contains(text(),'{{var1}}')]/../ul//a[contains(text(),'{{var2}}')]/../ul//a[contains(text(),'{{var3}}')]" parameterized="true"/>
+        <element name="categoryTreeForFour" type="input" selector="//a[contains(text(),'{{CatA}}') and contains(text(),'({{qty1}})') ]/../ul//a[contains(text(),'{{CatB}}') and  contains(text(),'({{qty2}})')]/../ul//a[contains(text(),'{{CatC}}') and contains(text(),'({{qty3}})')]/../../../../li[2]//a[contains(text(),'{{CatD}}') and contains(text(),'({{qty4}})')]" parameterized="true"/>
+        <element name="categoryTreeForFive" type="input" selector="//a[contains(text(),'{{CatA}}') and contains(text(),'({{qty1}})') ]/../ul//a[contains(text(),'{{CatB}}') and  contains(text(),'({{qty2}})')]/../ul//a[contains(text(),'{{CatC}}') and contains(text(),'({{qty3}})')]/../../../../li[2]//a[contains(text(),'{{CatD}}') and contains(text(),'({{qty4}})')]/../ul//a[contains(text(),'{{CatE}}') and contains(text(),'({{qty5}})')]" parameterized="true"/>
+        <element name="sourceCategory" type="text" selector="//li[contains(@class, 'jstree-node')]//a[contains(text(),'{{var1}}')]" parameterized="true"/>
+        <element name="destinationCategory" type="text" selector="//li[contains(@class, 'jstree-node')]//a[contains(text(),'Default Category')]"/>
         <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']"/>
         <element name="acceptPopUp" type="input" selector="//div[@class='modal-inner-wrap']//button[@class='action-primary']/span[text()='Ok']"/>
     </section>

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

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCategoryContentSection">
         <element name="sectionHeader" type="button" selector="div[data-index='content']" timeout="30"/>
         <element name="uploadButton" type="button" selector="//*[@class='file-uploader-area']/label[text()='Upload']"/>
@@ -19,9 +19,9 @@
         <element name="AddCMSBlock" type="select" selector="//*[@name='landing_page']"/>
         <element name="description" type="input" selector="//*[@name='description']"/>
         <element name="content" type="button" selector="div[data-index='content'"/>
-        <element name="categoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'no-active-category')]" parameterized="true" />
+        <element name="categoryInTree" type="button" selector="//li[contains(@class, 'jstree-node')]//a[contains(.,'{{categoryName}}') and contains(@class, 'jstree-anchor')]" parameterized="true" />
         <element name="categoryPageTitle" type="text" selector="h1.page-title" />
-        <element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'x-tree-node')]//div[contains(.,'{{categoryName}}') and contains(@class, 'active-category')]" parameterized="true" />
+        <element name="activeCategoryInTree" type="button" selector="//li[contains(@class, 'jstree-node')]//a[contains(.,'{{categoryName}}') and contains(@class, 'jstree-anchor jstree-clicked')]" parameterized="true" />
         <element name="productTableColumnName" type="input" selector="#catalog_category_products_filter_name"/>
         <element name="productTableRow" type="button" selector="#catalog_category_products_table tbody tr"/>
         <element name="productSearch" type="button" selector="//button[@data-action='grid-filter-apply']" timeout="30"/>

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

@@ -14,16 +14,17 @@
         <element name="categoryHighlighted" type="text" selector="//div[@id='store.menu']//span[contains(text(),'{{name}}')]/ancestor::li" parameterized="true" timeout="30"/>
         <element name="categoryNotHighlighted" type="text" selector="[id=\'store.menu\'] ul li.active" timeout="30"/>
         <element name="categoryTreeRoot" type="text" selector="li.x-tree-node:first-of-type > div.x-tree-node-el:first-of-type" timeout="30"/>
-        <element name="categoryInTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
-        <element name="categoryInTreeUnderRoot" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{name}}')]" parameterized="true"/>
-        <element name="childCategoryUnderParent" type="text" selector="//li/ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{parentCategoryName}}')]/../../../ul/li[@class='x-tree-node']/div/a/span[contains(text(), '{{childCategoryName}}')]" parameterized="true"/>
+        <element name="categoryInTree" type="text" selector="//a[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
+        <element name="categoryInFrontendTree" type="text" selector="//a/span[contains(text(), '{{name}}')]" parameterized="true" timeout="30"/>
+        <element name="categoryInTreeUnderRoot" type="text" selector="//ul/li[contains(@class, 'jstree-node')]/a[contains(text(), '{{name}}')]" parameterized="true"/>
+        <element name="childCategoryUnderParent" type="text" selector="//ul/li[contains(@class, 'jstree-node')]/a[contains(text(), '{{parentCategoryName}}')]/../ul/li[contains(@class, 'jstree-node')]/a[contains(text(), '{{childCategoryName}}')]" parameterized="true"/>
         <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="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="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"/>
+        <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[contains(text(), '{{categoryName}}')]" 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']//a[contains(text(),'SubCat') and contains(text(),'({{productCount}})')]" parameterized="true"/>
+        <element name="defaultCategoryProductCount" type="text" selector="//div[@class='tree-holder']//a[contains(text(),'Default Category') and contains(text(),'({{productCount}})')]" parameterized="true"/>
     </section>
 </sections>

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

@@ -11,17 +11,17 @@
     <section name="AdminProductAttributeSetEditSection">
         <!-- Groups Column -->
         <element name="groupTree" type="block" selector="#tree-div1"/>
-        <element name="attributeGroup" type="text" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']" parameterized="true"/>
-        <element name="attributeGroupExtender" type="button" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']" parameterized="true"/>
-        <element name="attributeGroupCollapsed" type="button" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']/parent::*/parent::*[contains(@class, 'collapsed')]" parameterized="true"/>
-        <element name="assignedAttribute" type="text" selector="//*[@id='tree-div1']//span[text()='{{attributeName}}']" parameterized="true"/>
+        <element name="attributeGroup" type="text" selector="//*[@id='tree-div1']//a[text()='{{groupName}}']" parameterized="true"/>
+        <element name="attributeGroupExtender" type="button" selector="//*[@id='tree-div1']//a[text()='{{groupName}}']" parameterized="true"/>
+        <element name="attributeGroupCollapsed" type="button" selector="//*[@id='tree-div1']//a[text()='{{groupName}}']/parent::*[contains(@class, 'jstree-closed')]" parameterized="true"/>
+        <element name="assignedAttribute" type="text" selector="//*[@id='tree-div1']//a[text()='{{attributeName}}']" parameterized="true"/>
         <element name="xThLineItemYthAttributeGroup" type="text" selector="//*[@id='tree-div1']/ul/div/li[{{y}}]//li[{{x}}]" parameterized="true"/>
-        <element name="xThLineItemAttributeGroup" type="text" selector="//*[@id='tree-div1']//span[text()='{{groupName}}']/parent::*/parent::*/parent::*//li[{{x}}]//a/span" parameterized="true"/>
+        <element name="xThLineItemAttributeGroup" type="text" selector="//*[@id='tree-div1']//a[text()='{{groupName}}']/parent::*//li[{{x}}]//a" parameterized="true"/>
         <element name="attributesInGroup" type="text" selector="//span[text()='{{GroupName}}']/../../following-sibling::ul/li" parameterized="true"/>
         <!-- Unassigned Attributes Column -->
         <element name="unassignedAttributesTree" type="block" selector="#tree-div2"/>
-        <element name="unassignedAttribute" type="text" selector="//*[@id='tree-div2']//span[text()='{{attributeName}}']" parameterized="true"/>
-        <element name="xThLineItemUnassignedAttribute" type="text" selector="//*[@id='tree-div2']//li[{{x}}]//a/span" parameterized="true"/>
+        <element name="unassignedAttribute" type="text" selector="//*[@id='tree-div2']//a[text()='{{attributeName}}']" parameterized="true"/>
+        <element name="xThLineItemUnassignedAttribute" type="text" selector="//*[@id='tree-div2']//li[{{x}}]//a" parameterized="true"/>
         <!-- Buttons -->
         <element name="AddNewGroup" type="button" selector="button[data-ui-id='adminhtml-catalog-product-set-edit-add-group-button']"/>
         <element name="DeleteSelectedGroup" type="button" selector="button[data-ui-id='adminhtml-catalog-product-set-edit-delete-group-button']"/>

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

@@ -12,7 +12,7 @@
         <element name="basedOn" type="select" selector="#skeleton_set"/>
         <element name="saveBtn" type="button" selector="button.save-attribute-set" timeout="30"/>
         <element name="deleteBtn" type="button" selector="button[title='Delete']" timeout="30"/>
-        <element name="attribute" type="button" selector="//span[text()='{{var1}}']" parameterized="true"/>
+        <element name="attribute" type="button" selector="//a[text()='{{var1}}']" parameterized="true"/>
         <element name="addNewGroupBtn" type="button" selector="button.add" timeout="30"/>
         <element name="newGroupName" type="input" selector="input[name='name']"/>
         <element name="modalOk" type="button" selector="button.action-accept" timeout="30"/>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/GroupSection.xml

@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="Group">
-        <element name="FolderName" type="text" selector="//span[text()='{{var1}}']" parameterized="true"/>
+        <element name="FolderName" type="text" selector="//a[text()='{{var1}}']" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductAttributeSetSection/UnassignedAttributesSection.xml

@@ -8,6 +8,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="UnassignedAttributes">
-        <element name="ProductAttributeName" type="text" selector="//span[text()='{{var1}}']" parameterized="true"/>
+        <element name="ProductAttributeName" type="text" selector="//a[text()='{{var1}}']" parameterized="true"/>
     </section>
 </sections>

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

@@ -38,6 +38,12 @@
             <deleteData createDataKey="createSubTestCategory" stepKey="deleteSubCategory"/>
             <deleteData createDataKey="createTestCategory" stepKey="deleteMainCategory"/>
         </after>
+
+        <!-- Reindex invalidated indices after product attribute has been created/deleted -->
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
+            <argument name="indices" value=""/>
+        </actionGroup>
+
         <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
             <argument name="categoryName" value="$$createTestCategory.name$$"/>
         </actionGroup>