Merge branch '2.3-develop' of github.com:magento/magento2ce into port-1101

Author: Mariana Lashch

app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml

@@ -16,5 +16,10 @@
         <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
         <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
         <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+        <element name="dashboard" type="button" selector="//li[@id='menu-magento-backend-dashboard']"/>
+        <element name="sales" type="button" selector="//li[@id='menu-magento-sales-sales']"/>
+        <element name="marketing" type="button" selector="//li[@id='menu-magento-backend-marketing']"/>
+        <element name="system" type="button" selector="//li[@id='menu-magento-backend-system']"/>
+        <element name="findPartners" type="button" selector="//li[@id='menu-magento-marketplace-partners']"/>
     </section>
 </sections>

app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminOrderBraintreeFillActionGroup.xml

@@ -6,7 +6,7 @@
   */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
 
     <actionGroup name="AdminOrderBraintreeFillActionGroup">
         <!--Select Braintree Payment method on Admin Order Create Page-->

app/code/Magento/User/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml renamed to app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminRoleActionGroup.xml

@@ -7,6 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+
     <actionGroup name="GoToUserRoles">
         <click selector="#menu-magento-backend-system" stepKey="clickOnSystemIcon"/>
         <waitForPageLoad stepKey="waitForSystemsPageToOpen"/>
@@ -15,18 +16,19 @@
     </actionGroup>
 
     <!--Create new role-->
-    <actionGroup name="AdminCreateRole">
+    <actionGroup name="AdminCreateNewRole">
         <arguments>
             <argument name="role" type="string" defaultValue=""/>
             <argument name="resource" type="string" defaultValue="All"/>
+            <argument name="scope" type="string" defaultValue="Custom"/>
+            <argument name="websites" type="string" defaultValue="Main Website"/>
         </arguments>
         <click selector="{{AdminCreateRoleSection.create}}" stepKey="clickToAddNewRole"/>
         <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{role.name}}" stepKey="setRoleName"/>
         <fillField stepKey="setPassword" selector="{{AdminCreateRoleSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
         <waitForPageLoad stepKey="waitForRoleResourcePage" time="5"/>
-        <click selector="{{AdminCreateRoleSection.roleScope}}" stepKey="clickToExpandScopeAccess"/>
-        <click selector="{{AdminCreateRoleSection.scopeValue(resource)}}" stepKey="clickToSelectScopeAccess"/>
+        <click stepKey="checkSales" selector="//a[text()='Sales']"/>
         <click selector="{{AdminCreateRoleSection.save}}" stepKey="clickToSaveRole"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You saved the role." stepKey="seeSuccessMessage" />
@@ -46,4 +48,4 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserActionGroup.xml renamed to app/code/Magento/Braintree/Test/Mftf/ActionGroup/AdminUserActionGroup.xml

@@ -41,9 +41,9 @@
 
 
     <!--Delete User-->
-    <actionGroup name="AdminDeleteUserActionGroup">
+    <actionGroup name="AdminDeleteNewUserActionGroup">
+
         <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser}}"/>
-        <waitForPageLoad stepKey="waitForUserPageToLoad"/>
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
@@ -52,4 +52,5 @@
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see userInput="You deleted the user." stepKey="seeSuccessMessage" />
     </actionGroup>
+
 </actionGroups>

app/code/Magento/Braintree/Test/Mftf/ActionGroup/ConfigureBraintreeActionGroup.xml

@@ -12,7 +12,7 @@
         <!-- GoTo ConfigureBraintree fields -->
         <click stepKey="clickOnSTORES" selector="{{AdminMenuSection.stores}}"/>
         <waitForPageLoad stepKey="waitForConfiguration" time="2"/>
-        <click stepKey="clickOnConfigurations" selector="{{StoresSubmenuSection.configuration}}" />
+        <click stepKey="clickOnConfigurations" selector="{{AdminMenuSection.configuration}}" />
         <waitForPageLoad stepKey="waitForSales" time="2"/>
         <click stepKey="clickOnSales" selector="{{ConfigurationListSection.sales}}" />
         <waitForPageLoad stepKey="waitForPaymentMethods" time="2"/>