Skip to content

Commit 89ad030

Browse files
victor-v-radvictor-v-rad
committed
MC-41545: [Magento Cloud] - Delivery Mehtods Permissions
1 parent 32fda1c commit 89ad030

File tree

4 files changed

+62
-2
lines changed

4 files changed

+62
-2
lines changed

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminVerifyPermissionsRoleForDeliveryMethodsSectionTest">
11+
<annotations>
12+
<stories value="Delivery Methods Section Admin Permissions Role"/>
13+
<title value="Verify Delivery Methods Section permission role gives access to restricted admin"/>
14+
<description value="Verify Delivery Methods Section permission role gives access to restricted admin"/>
15+
<severity value="CRITICAL"/>
16+
<group value="sales"/>
17+
<testCaseId value="MC-42591" />
18+
<useCaseId value="MC-41545"/>
19+
</annotations>
20+
<before>
21+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
22+
<!--Create restricted role-->
23+
<actionGroup ref="AdminCreateRoleActionGroup" stepKey="createUserRole">
24+
<argument name="restrictedRole" value="Delivery Methods Section"/>
25+
<argument name="User" value="adminRole"/>
26+
</actionGroup>
27+
<!--Create new admin user-->
28+
<actionGroup ref="AdminCreateUserActionGroup" stepKey="createAdminUser">
29+
<argument name="role" value="adminRole"/>
30+
<argument name="User" value="NewAdminUser"/>
31+
</actionGroup>
32+
</before>
33+
<after>
34+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
35+
<!--Delete created role-->
36+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="AdminDeleteRoleActionGroup">
37+
<argument name="roleName" value="{{adminRole.name}}"/>
38+
</actionGroup>
39+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetUserRoleFilters"/>
40+
<!--Delete created admin user -->
41+
<actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteAdminUserActionGroup">
42+
<argument name="user" value="NewAdminUser"/>
43+
</actionGroup>
44+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetAdminUserFilters"/>
45+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
46+
</after>
47+
<!--Log out-->
48+
<actionGroup ref="SignOut" stepKey="SignOut"/>
49+
<!--Log in as new user-->
50+
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginActionGroup">
51+
<argument name="username" value="{{NewAdminUser.username}}"/>
52+
<argument name="password" value="{{NewAdminUser.password}}"/>
53+
</actionGroup>
54+
<!--Check Delivery Methods configuration is accessible -->
55+
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
56+
<!--Log Out-->
57+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logOutFromRestrictedAdmin"/>
58+
</test>
59+
</tests>

‎app/code/Magento/Shipping/etc/acl.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<resource id="Magento_Config::config">
1515
<resource id="Magento_Shipping::config_shipping" title="Shipping Settings Section" translate="title" sortOrder="5" />
1616
<resource id="Magento_Shipping::shipping_policy" title="Shipping Policy Parameters Section" translate="title" sortOrder="5" />
17-
<resource id="Magento_Shipping::carriers" title="Shipping Methods Section" translate="title" sortOrder="5" />
17+
<resource id="Magento_Shipping::carriers" title="Delivery Methods Section" translate="title" sortOrder="5" />
1818
</resource>
1919
</resource>
2020
</resource>

‎app/code/Magento/Shipping/i18n/en_US.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Description,Description
162162
"See our Shipping Policy","See our Shipping Policy"
163163
"Shipping Settings Section","Shipping Settings Section"
164164
"Shipping Policy Parameters Section","Shipping Policy Parameters Section"
165-
"Shipping Methods Section","Shipping Methods Section"
165+
"Delivery Methods Section","Delivery Methods Section"
166166
"Shipping Settings","Shipping Settings"
167167
Origin,Origin
168168
Country,Country

‎app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="resourceCheckboxLink" type="checkbox" selector="//li[@data-id='{{resourceId}}']//a[text()='{{resourceName}}']" timeout="30" parameterized="true"/>
1515
<element name="resourceCheckbox" type="checkbox" selector="//li[@data-id='{{resourceId}}']/input" timeout="30" parameterized="true"/>
1616
<element name="userRoles" type="text" selector="//span[contains(text(), 'User Roles')]"/>
17+
<element name="roleScopes" type="select" selector="#gws_is_all"/>
1718
</section>
1819
</sections>

0 commit comments

Comments
 (0)