MC-41545: [Magento Cloud] - Delivery Mehtods Permissions

Author: victor-v-rad

app/code/Magento/Shipping/Test/Mftf/Test/AdminVerifyPermissionsRoleForDeliveryMethodsSectionTest.xml

@@ -20,7 +20,7 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Create restricted role-->
-            <actionGroup ref="AdminCreateRoleActionGroup" stepKey="createUserRole">
+            <actionGroup ref="AdminCreateRoleWithoutScopeSelectionActionGroup" stepKey="createUserRole">
                 <argument name="restrictedRole" value="Delivery Methods Section"/>
                 <argument name="User" value="adminRole"/>
             </actionGroup>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminAddRestrictedRoleActionGroup.xml

@@ -14,6 +14,7 @@
         <remove keyForRemoval="fillRoleName"/>
         <remove keyForRemoval="enterPassword"/>
         <remove keyForRemoval="clickRoleResourcesTab"/>
+        <remove keyForRemoval="waitForScopeSelection"/>
         <remove keyForRemoval="clickSaveRoleButton"/>
         <remove keyForRemoval="waitForPageLoad2"/>
         <scrollTo selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"  x="0" y="-100" stepKey="scrollToResourceElement" after="selectResourceAccessCustom"/>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml

@@ -22,6 +22,7 @@
         <fillField selector="{{AdminEditRoleInfoSection.roleName}}" userInput="{{User.name}}" stepKey="fillRoleName"/>
         <fillField selector="{{AdminEditRoleInfoSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterPassword"/>
         <click selector="{{AdminEditRoleInfoSection.roleResourcesTab}}" stepKey="clickRoleResourcesTab"/>
+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.roleScopes}}"  stepKey="waitForScopeSelection"/>
         <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="0" stepKey="selectResourceAccessCustom"/>
         <waitForElementVisible stepKey="waitForElementVisible" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}" time="30"/>
         <click stepKey="clickContentBlockCheckbox" selector="{{AdminEditRoleInfoSection.blockName('restrictedRole')}}"/>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateRoleWithoutScopeSelectionActionGroup.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateRoleWithoutScopeSelectionActionGroup" extends="AdminCreateRoleActionGroup">
+        <remove keyForRemoval="waitForScopeSelection"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminFillUserRoleRequiredDataActionGroup.xml

@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminFillUserRoleRequiredDataActionGroup" extends="AdminCreateRoleActionGroup">
         <remove keyForRemoval="clickRoleResourcesTab"/>
+        <remove keyForRemoval="waitForScopeSelection"/>
         <remove keyForRemoval="selectResourceAccessCustom"/>
         <remove keyForRemoval="waitForElementVisible"/>
         <remove keyForRemoval="clickContentBlockCheckbox"/>