Merge remote-tracking branch 'origin/AC-9141' into extjs-jira-ac-9320

Author: nishant04412

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/StorefrontProductsCompareWithEmptyAttributeTest.xml

@@ -47,7 +47,7 @@
         <dragAndDrop selector1="{{UnassignedAttributes.ProductAttributeName('$$createProductAttribute.attribute_code$$')}}" selector2="{{Group.FolderName('Product Details')}}" stepKey="moveProductAttributeToGroup"/>
         <click selector="{{AttributeSetSection.Save}}" stepKey="saveAttributeSet"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
-        <seeElement selector=".message-success" stepKey="assertSuccess"/>
+        <waitForElementVisible selector=".message-success" stepKey="assertSuccess"/>
         <actionGroup ref="ClearCacheActionGroup" stepKey="clearCache"/>
         <amOnPage url="{{StorefrontProductPage.NavigationCategoryByName($$createCategory.custom_attributes[url_key]$$)}}" stepKey="goProductPageOnStorefront1"/>
         <!-- View Simple Product 1 -->