Skip to content

Commit 8f081c1

Browse files
okolesnykokolesnyk
committed
Merge branch 'issue-709/create-admin-user-entity-test' of https://github.com/mmularski/magento-functional-tests-migration into 2.4-develop-community
2 parents fa93125 + 25abbc8 commit 8f081c1

File tree

7 files changed

+91
-45
lines changed

7 files changed

+91
-45
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCreateUserWithRoleAndIsInactiveActionGroup" extends="AdminCreateUserActionGroup">
12+
<checkOption selector="{{AdminNewUserFormSection.userInactive}}" stepKey="checkIsInactive" after="confirmPassword"/>
13+
</actionGroup>
14+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
2020
<waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
21-
<click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.name)}}"/>
21+
<click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
2222
<fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
2323
<scrollToTopOfPage stepKey="scrollToTop"/>
2424
<click stepKey="clickToDeleteRole" selector="{{AdminDeleteUserSection.delete}}"/>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,38 @@
145145
<data key="username">admin_user_with_correct_password</data>
146146
<data key="password">123123123q</data>
147147
</entity>
148+
<entity name="activeAdmin" type="user">
149+
<data key="username" unique="suffix">AdminUser</data>
150+
<data key="firstname" unique="suffix">FirstName</data>
151+
<data key="lastname" unique="suffix">LastName</data>
152+
<data key="email" unique="prefix">admin@example.com</data>
153+
<data key="password">123123q</data>
154+
<data key="password_confirmation">123123q</data>
155+
<data key="interface_local">en_US</data>
156+
<data key="interface_local_label">English (United States)</data>
157+
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
158+
<data key="role">Administrators</data>
159+
<data key="is_active">1</data>
160+
<array key="roles">
161+
<item>1</item>
162+
</array>
163+
</entity>
164+
<entity name="inactiveAdmin" type="user">
165+
<data key="username" unique="suffix">AdminUser</data>
166+
<data key="firstname" unique="suffix">FirstName</data>
167+
<data key="lastname" unique="suffix">LastName</data>
168+
<data key="email" unique="prefix">admin@example.com</data>
169+
<data key="password">123123q</data>
170+
<data key="password_confirmation">123123q</data>
171+
<data key="interface_local">en_US</data>
172+
<data key="interface_local_label">English (United States)</data>
173+
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
174+
<data key="role">Administrators</data>
175+
<data key="is_active">0</data>
176+
<array key="roles">
177+
<item>1</item>
178+
</array>
179+
</entity>
148180
<!--
149181
Since User delete action is performed via POST request we created this entity to be able to delete it.
150182
Please use "AdminDeleteUserViaCurlActionGroup".

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
<data key="access">1</data>
1616
</entity>
1717

18+
<entity name="roleDefaultAdministrator" type="role">
19+
<data key="name">Administrators</data>
20+
<data key="rolename">Administrators</data>
21+
<data key="scope">1</data>
22+
<data key="access">1</data>
23+
</entity>
24+
1825
<entity name="roleAdministrator" type="user_role">
1926
<data key="name" unique="suffix">Administrator </data>
2027
<data key="rolename" unique="suffix">Administrator </data>

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,29 @@
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
2121
</annotations>
22-
<before>
23-
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
24-
</before>
2522
<after>
26-
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
23+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
2724
<actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
2825
<argument name="user" value="activeAdmin"/>
2926
</actionGroup>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3028
</after>
3129

32-
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33-
<argument name="role" value="genericAdminRole"/>
30+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
31+
<actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
3432
<argument name="user" value="activeAdmin"/>
33+
<argument name="role" value="roleDefaultAdministrator"/>
3534
</actionGroup>
3635
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
37-
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
38-
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{activeAdmin.username}}" stepKey="fillUsername"/>
39-
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{activeAdmin.password}}" stepKey="fillPassword"/>
40-
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
41-
<closeAdminNotification stepKey="closeAdminNotification"/>
36+
37+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToNewAdmin">
38+
<argument name="username" value="{{activeAdmin.username}}"/>
39+
<argument name="password" value="{{activeAdmin.password}}"/>
40+
</actionGroup>
4241
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
43-
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{activeAdmin.username}}" stepKey="fillUsernameSearch"/>
44-
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
45-
<waitForPageLoad time="10" stepKey="wait1"/>
46-
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{activeAdmin.username}}" stepKey="seeFoundUsername"/>
42+
<actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="assertAdminIsInGrid">
43+
<argument name="user" value="activeAdmin"/>
44+
</actionGroup>
4745
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutCreatedUser"/>
4846
</test>
4947
</tests>

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

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,23 @@
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
2121
</annotations>
22-
<before>
23-
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
24-
</before>
25-
<after>
26-
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
27-
<actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
28-
<argument name="user" value="inactiveAdmin"/>
29-
</actionGroup>
30-
</after>
3122

23+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminMasterLogin"/>
3224
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33-
<argument name="role" value="genericAdminRole"/>
3425
<argument name="user" value="inactiveAdmin"/>
26+
<argument name="role" value="roleDefaultAdministrator"/>
3527
</actionGroup>
3628
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
37-
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{inactiveAdmin.username}}" stepKey="fillUsernameSearch"/>
38-
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearchButton"/>
39-
<waitForPageLoad time="10" stepKey="wait1"/>
40-
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{inactiveAdmin.username}}" stepKey="seeFoundUsername"/>
41-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>
42-
<amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
43-
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{inactiveAdmin.username}}" stepKey="fillUsername"/>
44-
<fillField selector="{{AdminLoginFormSection.password}}" userInput="{{inactiveAdmin.password}}" stepKey="fillPassword"/>
45-
<click selector="{{AdminLoginFormSection.signIn}}" stepKey="clickLogin"/>
29+
<actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="assertAdminIsInGrid">
30+
<argument name="user" value="inactiveAdmin"/>
31+
</actionGroup>
32+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminMasterLogout"/>
33+
34+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminNewLogin">
35+
<argument name="username" value="{{inactiveAdmin.username}}"/>
36+
<argument name="password" value="{{inactiveAdmin.password}}"/>
37+
</actionGroup>
4638
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeUserErrorMessage" />
39+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminNewLogout"/>
4740
</test>
4841
</tests>

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
<group value="user"/>
2020
<group value="mtf_migrated"/>
2121
</annotations>
22-
2322
<before>
2423
<magentoCLI command="config:set admin/captcha/enable 0" stepKey="disableAdminCaptcha"/>
2524
<magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
26-
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
25+
<actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
2726
</before>
2827
<after>
2928
<magentoCLI command="config:set admin/captcha/enable 1" stepKey="enableAdminCaptcha"/>
3029
<magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
31-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
30+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
3231
</after>
3332

3433
<!--Create New User-->
@@ -48,23 +47,26 @@
4847

4948
<!-- Log in to Admin Panel with incorrect password specified number of times-->
5049
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultUser"/>
51-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserFirstAttempt">
52-
<argument name="adminUser" value="adminUserIncorrectPassword"/>
50+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserFirstAttempt">
51+
<argument name="username" value="{{adminUserIncorrectPassword.username}}"/>
52+
<argument name="password" value="{{adminUserIncorrectPassword.password}}"/>
5353
</actionGroup>
5454
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorFirstAttempt"/>
55-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserSecondAttempt">
56-
<argument name="adminUser" value="adminUserIncorrectPassword"/>
55+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserSecondAttempt">
56+
<argument name="username" value="{{adminUserIncorrectPassword.username}}"/>
57+
<argument name="password" value="{{adminUserIncorrectPassword.password}}"/>
5758
</actionGroup>
5859
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorSecondAttempt"/>
5960

6061
<!-- Log in to Admin Panel with correct password-->
61-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserThirdAttempt">
62-
<argument name="adminUser" value="adminUserCorrectPassword"/>
62+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserThirdAttempt">
63+
<argument name="username" value="{{adminUserCorrectPassword.username}}"/>
64+
<argument name="password" value="{{adminUserCorrectPassword.password}}"/>
6365
</actionGroup>
6466
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorThirdAttempt"/>
6567

6668
<!--Login as default admin user-->
67-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
69+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUser"/>
6870

6971
<!--Delete new User-->
7072
<actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">

0 commit comments

Comments
 (0)