Skip to content

Commit a90961f

Browse files
kate-kyzymakate-kyzyma
committed
[WIP] issue-310-code-refactoring ()
1 parent f9d46a0 commit a90961f

File tree

7 files changed

+38
-50
lines changed

7 files changed

+38
-50
lines changed

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertUserRoleRestrictedAccessActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AssertUserRoleRestrictedAccessActionGroup">
12-
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
1312
<see selector="{{AdminHeaderSection.pageHeading}}" userInput="Sorry, you need permissions to view this content." stepKey="seeErrorMessage" />
1413
</actionGroup>
1514
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminNavigateToUserRolesActionGroup.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertUserSuccessSaveMessageActionGroup.xml renamed to ‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenAdminUsersPageActionGroup.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
98
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
109
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AssertUserSuccessSaveMessageActionGroup">
12-
<see selector="{{AdminMessagesSection.successMessage}}" userInput="You saved the user." stepKey="seeAdminUserInGrid"/>
10+
<actionGroup name="AdminOpenAdminUsersPageActionGroup">
11+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
12+
<waitForPageLoad stepKey="waitForAdminUsersPageLoad"/>
1313
</actionGroup>
1414
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminOpenUserEditPageActionGroup.xml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminOpenUserEditPageActionGroup">
1111
<arguments>
12-
<argument name="user" type="entity"/>
13-
</arguments>
14-
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
15-
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
16-
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
17-
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
18-
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser" />
19-
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
20-
<waitForPageLoad stepKey="waitForUserEditPageLoad" time="15"/>
21-
</actionGroup>
22-
</actionGroups>
12+
<argument name="user" type="entity"/>
13+
</arguments>
14+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUserGrid" />
15+
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
16+
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
17+
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
18+
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{user.username}}" stepKey="seeUser" />
19+
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
20+
<waitForPageLoad stepKey="waitForUserEditPageLoad" time="15"/>
21+
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/User/Test/Mftf/Data/UserRoleData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<data key="resources">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails','Magento_Backend::system','Magento_Backend::system_other_settings','Magento_AdminNotification::adminnotification','Magento_AdminNotification::show_list']</data>
2626
</entity>
2727
<entity name="salesRole" type="role">
28-
<data key="name" unique="suffix">Sales</data>
28+
<data key="name" unique="suffix">Sales Role</data>
2929
<data key="resourceAccess">Custom</data>
3030
<data key="resources">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails']</data>
3131
</entity>

‎app/code/Magento/User/Test/Mftf/Test/AdminUpdateUserRoleTest.xml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</annotations>
1919

2020
<before>
21-
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
21+
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
2222
</before>
2323
<after>
2424
<actionGroup ref="logout" stepKey="logOut"/>
@@ -27,49 +27,52 @@
2727
<!--Create New User-->
2828
<actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
2929
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
30-
<argument name="user" value="NewAdminUser" />
30+
<argument name="user" value="NewAdminUser"/>
3131
</actionGroup>
3232
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
3333

34-
3534
<!--Create New Role-->
36-
<actionGroup ref="AdminNavigateToUserRolesActionGroup" stepKey="openUserRolesGrig"/>
3735
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
3836
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
3937
<argument name="role" value="salesRole"/>
4038
</actionGroup>
41-
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveRole"/>
39+
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
4240

4341
<!--Assign new role-->
4442
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
45-
<argument name="user" value="NewAdminUser"/>
46-
</actionGroup>
43+
<argument name="user" value="NewAdminUser"/>
44+
</actionGroup>
45+
4746
<actionGroup ref="AdminUpdateUserRoleActionGroup" stepKey="assignNewUserRole">
4847
<argument name="role" value="salesRole"/>
4948
</actionGroup>
5049
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveUser"/>
51-
<actionGroup ref="AssertUserSuccessSaveMessageActionGroup" stepKey="seeSuccessSaveUserMessage"/>
50+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
51+
<argument name="message" value="You saved the user."/>
52+
</actionGroup>
53+
5254
<actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="seeUserInGrid">
5355
<argument name="user" value="NewAdminUser"/>
5456
</actionGroup>
55-
56-
<actionGroup ref="logout" stepKey="logOutFromAdminPanel"/>
57+
<actionGroup ref="logout" stepKey="logOutFromAdminPanel"/>
5758
<actionGroup ref="LoginAsAdmin" stepKey="loginAsSaleRoleUser">
5859
<argument name="adminUser" value="NewAdminUser"/>
5960
</actionGroup>
60-
<actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="seeSuccessloginMessage"/>
61-
<actionGroup ref="AssertUserRoleRestrictedAccessActionGroup" stepKey="seeErrorMessage"/>
61+
<actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="seeSuccessloginMessage"/>
62+
<actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="navigateToAdminUsersPage"/>
63+
<actionGroup ref="AssertUserRoleRestrictedAccessActionGroup" stepKey="seeErrorMessage"/>
6264

63-
<!--Delete new User-->
65+
<!--Delete new User-->
6466
<actionGroup ref="logout" stepKey="logoutAsSaleRoleUser"/>
6567
<actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
6668
<actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
6769
<argument name="user" value="NewAdminUser"/>
6870
</actionGroup>
6971

70-
<!--Delete Role-->
71-
<actionGroup ref="AdminNavigateToUserRolesActionGroup" stepKey="goBackToUserRolesGrig"/>
72-
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole"/>
72+
<!--Delete new Role-->
73+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole">
74+
<argument name="roleName" value="{{salesRole.name}}"/>
75+
</actionGroup>
7376

74-
</test>
75-
</tests>
77+
</test>
78+
</tests>

‎dev/tests/functional/tests/app/Magento/User/Test/TestCase/UpdateAdminUserEntityTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\User\Test\TestCase\UpdateAdminUserEntityTest" summary="Update Admin User" ticketId="MAGETWO-24345">
1010
<variation name="UpdateAdminUserEntityTestVariation2">
11+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
1112
<data name="tag" xsi:type="string">severity:S3</data>
1213
<data name="initialUser/dataset" xsi:type="string">custom_admin_with_default_role</data>
1314
<data name="user/data/role_id/dataset" xsi:type="string">role::role_sales</data>

0 commit comments

Comments
 (0)