Skip to content

Commit c727a32

Browse files
atwix-frameworkatwix-framework
committed
Refactoring
1 parent b8f7a2c commit c727a32

File tree

7 files changed

+117
-48
lines changed

7 files changed

+117
-48
lines changed

‎app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<element name="username" type="input" selector="#username"/>
1313
<element name="password" type="input" selector="#login"/>
1414
<element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
15-
<element name="error" type="text" selector=".message.message-error.error"/>
1615
<element name="forgotPasswordLink" type="button" selector=".action-forgotpassword" timeout="10"/>
1716
</section>
1817
</sections>

‎app/code/Magento/Security/Test/Mftf/Test/LockAdminUserWhenEditingUserTest.xml renamed to ‎app/code/Magento/Security/Test/Mftf/Test/AdminUserLockWhenEditingUserTest.xml

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11-
<test name="LockAdminUserWhenEditingUserTest">
11+
<test name="AdminUserLockWhenEditingUserTest">
1212
<annotations>
1313
<features value="Security"/>
1414
<stories value="Runs Lock admin user when creating new user test."/>
@@ -25,93 +25,125 @@
2525
</before>
2626
<after>
2727
<!-- Unlock Admin user -->
28-
<magentoCLI command="admin:user:unlock {{_ENV.MAGENTO_ADMIN_USERNAME}}" stepKey="unlockAdminUser"/>
28+
<magentoCLI command="admin:user:unlock {{DefaultAdminUser.username}}" stepKey="unlockAdminUser"/>
2929
<!-- TODO Need to create delete operation for data entity="Admin3"
3030
<deleteData createDataKey="user" stepKey="removeAdminUser"/>-->
3131
</after>
3232

33-
<actionGroup ref="AdminEditUserActionGroup" stepKey="editUserFirstAttempt">
33+
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openEditUserPageFirstAttempt">
34+
<argument name="adminUser" value="$$user.username$$"/>
35+
</actionGroup>
36+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsFirstAttempt">
3437
<argument name="adminUser" value="$$user.username$$"/>
3538
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
3639
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
3740
<argument name="adminEmail" value="new$$user.email$$"/>
3841
<argument name="adminPassword" value="NEW$$user.password$$"/>
3942
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
43+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
44+
</actionGroup>
45+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleFirstAttempt">
4046
<argument name="adminUserRole" value="1"/>
41-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
47+
</actionGroup>
48+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserFirstAttempt" />
49+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorFirstAttempt" >
50+
<argument name="messageType" value="error" />
4251
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
43-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
4452
</actionGroup>
4553

46-
<actionGroup ref="AdminEditUserActionGroup" stepKey="editUserSecondAttempt">
54+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsSecondAttempt">
4755
<argument name="adminUser" value="$$user.username$$"/>
4856
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
4957
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
5058
<argument name="adminEmail" value="new$$user.email$$"/>
5159
<argument name="adminPassword" value="NEW$$user.password$$"/>
5260
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
61+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
62+
</actionGroup>
63+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleSecondAttempt">
5364
<argument name="adminUserRole" value="1"/>
54-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
65+
</actionGroup>
66+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserSecondAttempt" />
67+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorSecondAttempt" >
68+
<argument name="messageType" value="error" />
5569
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
56-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
5770
</actionGroup>
5871

59-
<actionGroup ref="AdminEditUserActionGroup" stepKey="editUserThirdAttempt">
72+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsThirdAttempt">
6073
<argument name="adminUser" value="$$user.username$$"/>
6174
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
6275
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
6376
<argument name="adminEmail" value="new$$user.email$$"/>
6477
<argument name="adminPassword" value="NEW$$user.password$$"/>
6578
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
79+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
80+
</actionGroup>
81+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleThirdAttempt">
6682
<argument name="adminUserRole" value="1"/>
67-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
83+
</actionGroup>
84+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserThirdAttempt" />
85+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorThirdAttempt" >
86+
<argument name="messageType" value="error" />
6887
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
69-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
7088
</actionGroup>
7189

72-
<actionGroup ref="AdminEditUserActionGroup" stepKey="editUserFourthAttempt">
90+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsFourthAttempt">
7391
<argument name="adminUser" value="$$user.username$$"/>
7492
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
7593
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
7694
<argument name="adminEmail" value="new$$user.email$$"/>
7795
<argument name="adminPassword" value="NEW$$user.password$$"/>
7896
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
97+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
98+
</actionGroup>
99+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleFourthAttempt">
79100
<argument name="adminUserRole" value="1"/>
80-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
101+
</actionGroup>
102+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserFourthAttempt" />
103+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorFourthAttempt" >
104+
<argument name="messageType" value="error" />
81105
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
82-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
83106
</actionGroup>
84107

85-
<actionGroup ref="AdminEditUserActionGroup" stepKey="editUserFifthAttempt">
108+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsFifthAttempt">
86109
<argument name="adminUser" value="$$user.username$$"/>
87110
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
88111
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
89112
<argument name="adminEmail" value="new$$user.email$$"/>
90113
<argument name="adminPassword" value="NEW$$user.password$$"/>
91114
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
115+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
116+
</actionGroup>
117+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleFifthAttempt">
92118
<argument name="adminUserRole" value="1"/>
93-
<argument name="messageSelector" value="{{AdminMessagesSection.error}}" />
119+
</actionGroup>
120+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserFifthAttempt" />
121+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeErrorFifthAttempt" >
122+
<argument name="messageType" value="error" />
94123
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
95-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
96124
</actionGroup>
97125

98-
<actionGroup ref="AdminEditUserActionGroup" stepKey="openEditLastPage">
126+
<actionGroup ref="AdminUserEditFillRequiredFieldsActionGroup" stepKey="fillEditUserFieldsLastAttempt">
99127
<argument name="adminUser" value="$$user.username$$"/>
100128
<argument name="adminFirstname" value="NEW$$user.firstname$$"/>
101129
<argument name="adminLastname" value="NEW$$user.lastname$$"/>
102130
<argument name="adminEmail" value="new$$user.email$$"/>
103131
<argument name="adminPassword" value="NEW$$user.password$$"/>
104132
<argument name="adminPasswordConfirmation" value="NEW$$user.password_confirmation$$"/>
133+
<argument name="currentAdminPassword" value="{{DefaultAdminUser.password}}INVALID"/>
134+
</actionGroup>
135+
<actionGroup ref="AdminUserEditAssignRoleActionGroup" stepKey="assignRoleLastAttempt">
105136
<argument name="adminUserRole" value="1"/>
106-
<argument name="messageSelector" value="{{AdminLoginFormSection.error}}" />
137+
</actionGroup>
138+
<actionGroup ref="AdminUserEditSaveUserActionGroup" stepKey="saveUserLastAttempt" />
139+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeErrorLastAttempt" >
107140
<argument name="message" value="Your account is temporarily disabled. Please try again later." />
108-
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
109141
</actionGroup>
110142

111143
<!-- Try to login as admin and check error -->
112144
<actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
113145
<waitForPageLoad stepKey="waitForError"/>
114-
<see selector="{{AdminLoginFormSection.error}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"
115-
stepKey="seeLoginUserError"/>
146+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeLoginErrorMessage" />
147+
116148
</test>
117149
</tests>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminOpenUserEditPageActionGroup">
11+
<arguments>
12+
<argument name="adminUser" type="string" defaultValue="DefaultAdminUser.username"/>
13+
</arguments>
14+
15+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="openAdminUsersPage"/>
16+
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{adminUser}}" stepKey="fillSearchUsernameFilter"/>
17+
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
18+
<waitForPageLoad stepKey="waitForGridToLoad"/>
19+
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{adminUser}}" stepKey="seeUser" />
20+
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
21+
<waitForPageLoad stepKey="waitForUserEditPageLoad"/>
22+
23+
</actionGroup>
24+
</actionGroups>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminUserEditAssignRoleActionGroup">
11+
<arguments>
12+
<argument name="adminUserRole" type="string"/>
13+
</arguments>
14+
<!-- Set admin User Role -->
15+
<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="openUserRoleTab"/>
16+
<click selector="{{AdminEditUserSection.administratorRoleRadio(adminUserRole)}}" stepKey="assignRole"/>
17+
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminEditUserActionGroup.xml renamed to ‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserEditFillRequiredFieldsActionGroup.xml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,17 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AdminEditUserActionGroup">
10+
<actionGroup name="AdminUserEditFillRequiredFieldsActionGroup">
1111
<arguments>
1212
<argument name="adminUser" type="string" />
1313
<argument name="adminFirstname" type="string" />
1414
<argument name="adminLastname" type="string" />
1515
<argument name="adminEmail" type="string" />
1616
<argument name="adminPassword" type="string" />
1717
<argument name="adminPasswordConfirmation" type="string" />
18-
<argument name="currentAdminPassword" type="string" />
19-
<argument name="adminUserRole" type="string"/>
20-
<argument name="message" type="string" defaultValue="You saved the user." />
21-
<argument name="messageSelector" type="string" defaultValue="{{AdminMessagesSection.success}}" />
18+
<argument name="currentAdminPassword" type="string" defaultValue="DefaultAdminUser.password" />
2219
</arguments>
2320

24-
<!-- Navigate to edit user page -->
25-
<amOnPage url="{{AdminUsersPage.url}}" stepKey="openAdminUsersPage"/>
26-
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{adminUser}}" stepKey="fillSearchUsernameFilter"/>
27-
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch" />
28-
<waitForPageLoad stepKey="waitForGridToLoad"/>
29-
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{adminUser}}" stepKey="seeUser" />
30-
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="openUserEdit"/>
31-
<waitForPageLoad stepKey="waitForUserEditPageLoad"/>
32-
3321
<!-- Edit admin User data -->
3422
<fillField selector="{{AdminEditUserSection.usernameTextField}}" userInput="{{adminUser}}" stepKey="fillUser"/>
3523
<fillField selector="{{AdminEditUserSection.firstNameTextField}}" userInput="{{adminFirstname}}" stepKey="fillFirstName"/>
@@ -40,14 +28,5 @@
4028
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
4129
<scrollToTopOfPage stepKey="ScrollToTopOfPage"/>
4230

43-
<!-- Set admin User Role -->
44-
<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="openUserRoleTab"/>
45-
<click selector="{{AdminEditUserSection.administratorRoleRadio(adminUserRole)}}" stepKey="assignRole"/>
46-
47-
<!-- Save User -->
48-
<click selector="{{AdminEditUserSection.saveButton}}" stepKey="saveUser"/>
49-
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
50-
<see userInput="{{message}}" selector="{{messageSelector}}" stepKey="verifyMessage" />
51-
5231
</actionGroup>
5332
</actionGroups>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminUserEditSaveUserActionGroup">
11+
12+
<!-- Save User -->
13+
<click selector="{{AdminEditUserSection.saveButton}}" stepKey="saveUser"/>
14+
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
15+
16+
</actionGroup>
17+
</actionGroups>

‎dev/tests/functional/tests/app/Magento/Security/Test/TestCase/LockAdminUserWhenEditingUserTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<testCase name="Magento\Security\Test\TestCase\LockAdminUserWhenEditingUserTest" summary="Lock admin user after entering incorrect password while editing existing user">
1010
<variation name="LockAdminUserWhenEditingUseruserTestVariation1">
1111
<data name="configData" xsi:type="string">user_lockout_failures</data>
12-
<data name="tag" xsi:type="string">severity:S2</data>
12+
<data name="tag" xsi:type="string">severity:S2, mftf_migrated:yes</data>
1313
<data name="customAdmin/dataset" xsi:type="string">custom_admin_with_default_role</data>
1414
<data name="user/data/username" xsi:type="string">AdminUser%isolation%</data>
1515
<data name="user/data/firstname" xsi:type="string">FirstName%isolation%</data>
@@ -19,7 +19,6 @@
1919
<data name="user/data/password_confirmation" xsi:type="string">123123qq</data>
2020
<data name="user/data/current_password" xsi:type="string">incorrect password</data>
2121
<data name="attempts" xsi:type="string">4</data>
22-
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
2322
<constraint name="Magento\Security\Test\Constraint\AssertUserIsLocked" />
2423
</variation>
2524
</testCase>

0 commit comments

Comments
 (0)