Merge remote-tracking branch 'upstream/2.4-develop' into honey-pr-bundle

Author: melnikovi

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressGridMainActionsSection.xml

@@ -13,8 +13,9 @@
         <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
         <element name="multicheckTick" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>input"/>
         <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
-        <element name="actions" type="text" selector=".action-select"/>
         <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
         <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
+        <element name="addNewAddress" type="button" selector=".add-new-address-button" timeout="30"/>
+        <element name="actions" type="text" selector=".admin__data-grid-header-row .action-select"/>
     </section>
 </sections>

app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml

@@ -9,7 +9,8 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminDeleteRoleSection">
         <element name="theRole" selector="//td[contains(text(), 'Role')]" type="button"/>
-        <element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
+        <element name="salesRole" selector="//td[contains(text(), 'Sales')]" type="button"/>
+        <element name="role" parameterized="true" selector="//td[contains(@class,'col-role_name') and contains(text(), '{{roleName}}')]" type="button"/>
         <element name="current_pass" type="button" selector="#current_password"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete Role')]" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>

app/code/Magento/User/Test/Mftf/Section/AdminDeleteRoleSection.xml

@@ -11,7 +11,7 @@
         <element name="theUser" selector="//td[contains(text(), '{{userName}}')]" type="button" parameterized="true"/>
         <element name="password" selector="#user_current_password" type="input"/>
         <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
-        <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
+        <element name="confirm" selector=".action-primary.action-accept" type="button"/>
         <element name="role" parameterized="true" selector="//td[contains(text(), '{{args}}')]" type="button"/>
     </section>
 </sections>