Skip to content

Commit b49305c

Browse files
atwix-frameworkatwix-framework
committed
Add arguments to AdminNewUserInvalidCurrentUserPasswordActionGroup, add review suggestions
1 parent 58211e3 commit b49305c

File tree

4 files changed

+75
-16
lines changed

4 files changed

+75
-16
lines changed

‎app/code/Magento/Security/Test/Mftf/ActionGroup/AdminNewUserInvalidCurrentUserPasswordActionGroup.xml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,27 @@
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1010
<actionGroup name="AdminNewUserInvalidCurrentUserPasswordActionGroup">
11+
<arguments>
12+
<argument name="adminUser" type="string" />
13+
<argument name="adminFirstname" type="string" />
14+
<argument name="adminLastname" type="string" />
15+
<argument name="adminEmail" type="string" />
16+
<argument name="adminPassword" type="string" />
17+
<argument name="adminPasswordConfirmation" type="string" />
18+
<argument name="currentAdminPassword" type="string" />
19+
<argument name="adminUserRole" type="string"/>
20+
</arguments>
1121
<!-- Fill in all data according to data set (current password is incorrect). -->
12-
<fillField selector="{{AdminNewUserSection.username}}" userInput="{{AdminUserData.username}}" stepKey="fillUser"/>
13-
<fillField selector="{{AdminNewUserSection.firstname}}" userInput="{{AdminUserData.firstname}}" stepKey="fillFirstName"/>
14-
<fillField selector="{{AdminNewUserSection.lastname}}" userInput="{{AdminUserData.lastname}}" stepKey="fillLastName"/>
15-
<fillField selector="{{AdminNewUserSection.email}}" userInput="{{AdminUserData.email}}" stepKey="fillEmail"/>
16-
<fillField selector="{{AdminNewUserSection.password}}" userInput="{{AdminUserData.password}}" stepKey="fillPassword"/>
17-
<fillField selector="{{AdminNewUserSection.confirmation}}" userInput="{{AdminUserData.password}}" stepKey="fillPasswordConfirmation"/>
18-
<fillField selector="{{AdminNewUserSection.currentPassword}}" userInput="{{AdminUserData.password}}INVALID" stepKey="fillCurrentUserPassword"/>
22+
<fillField selector="{{AdminNewUserSection.username}}" userInput="{{adminUser}}" stepKey="fillUser"/>
23+
<fillField selector="{{AdminNewUserSection.firstname}}" userInput="{{adminFirstname}}" stepKey="fillFirstName"/>
24+
<fillField selector="{{AdminNewUserSection.lastname}}" userInput="{{adminLastname}}" stepKey="fillLastName"/>
25+
<fillField selector="{{AdminNewUserSection.email}}" userInput="{{adminEmail}}" stepKey="fillEmail"/>
26+
<fillField selector="{{AdminNewUserSection.password}}" userInput="{{adminPassword}}" stepKey="fillPassword"/>
27+
<fillField selector="{{AdminNewUserSection.confirmation}}" userInput="{{adminPasswordConfirmation}}" stepKey="fillPasswordConfirmation"/>
28+
<fillField selector="{{AdminNewUserSection.currentPassword}}" userInput="{{currentAdminPassword}}" stepKey="fillCurrentUserPassword"/>
1929
<scrollToTopOfPage stepKey="ScrollToTopOfPage"/>
2030
<click selector="{{AdminNewUserSection.userRoleTab}}" stepKey="openUserRoleTab"/>
21-
<click selector="{{AdminNewUserSection.administratorRole('1')}}" stepKey="assignRole"/>
31+
<click selector="{{adminUserRole}}" stepKey="assignRole"/>
2232
<click selector="{{AdminNewUserSection.save}}" stepKey="saveNewUser"/>
2333
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
2434
</actionGroup>

‎app/code/Magento/Security/Test/Mftf/Data/AdminUserData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<entity name="AdminUserData" type="admin">
1212
<data key="email" unique="prefix">John.Doe@example.com</data>
1313
<data key="firstname">John</data>
14-
<data key="username">lockuser</data>
14+
<data key="username" unique="prefix">lockuser</data>
1515
<data key="lastname">Doe</data>
1616
<data key="password">pwdTest123!</data>
1717
</entity>

‎app/code/Magento/Security/Test/Mftf/Test/LockAdminUserWhenCreatingNewUserTest.xml

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,68 @@
3333

3434
<!-- Perform add new admin user 6 specified number of times.
3535
"The password entered for the current user is invalid. Verify the password and try again." appears after each attempt.-->
36-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt1">
36+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserFirstAttempt">
37+
<argument name="adminUser" value="{{AdminUserData.username}}" />
38+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
39+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
40+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
41+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
42+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
43+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
44+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
3745
</actionGroup>
3846
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
3947
<see selector="{{AdminMessagesSection.error}}" userInput="The password entered for the current user is invalid. Verify the password and try again."
4048
stepKey="seeInvalidPasswordError"/>
41-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt2">
49+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserSecondAttempt">
50+
<argument name="adminUser" value="{{AdminUserData.username}}" />
51+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
52+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
53+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
54+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
55+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
56+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
57+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
4258
</actionGroup>
43-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt3">
59+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserThirdAttempt">
60+
<argument name="adminUser" value="{{AdminUserData.username}}" />
61+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
62+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
63+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
64+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
65+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
66+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
67+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
4468
</actionGroup>
45-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt4">
69+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserFourthAttempt">
70+
<argument name="adminUser" value="{{AdminUserData.username}}" />
71+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
72+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
73+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
74+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
75+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
76+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
77+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
4678
</actionGroup>
47-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt5">
79+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserFifthAttempt">
80+
<argument name="adminUser" value="{{AdminUserData.username}}" />
81+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
82+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
83+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
84+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
85+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
86+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
87+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
4888
</actionGroup>
49-
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserAttempt6">
89+
<actionGroup ref="AdminNewUserInvalidCurrentUserPasswordActionGroup" stepKey="failedSaveUserSixthAttempt">
90+
<argument name="adminUser" value="{{AdminUserData.username}}" />
91+
<argument name="adminFirstname" value="{{AdminUserData.firstname}}" />
92+
<argument name="adminLastname" value="{{AdminUserData.lastname}}" />
93+
<argument name="adminEmail" value="{{AdminUserData.email}}" />
94+
<argument name="adminPassword" value="{{AdminUserData.password}}" />
95+
<argument name="adminPasswordConfirmation" value="{{AdminUserData.password}}" />
96+
<argument name="currentAdminPassword" value="{{AdminUserData.password}}INVALID" />
97+
<argument name="adminUserRole" value="{{AdminNewUserSection.administratorRole('1')}}" />
5098
</actionGroup>
5199

52100
<!-- Check Error that account has been locked -->
@@ -57,6 +105,6 @@
57105
<actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
58106
<waitForPageLoad stepKey="waitForError"/>
59107
<see selector="{{AdminLoginFormSection.error}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"
60-
stepKey="seeLockUserError2"/>
108+
stepKey="seeLoginUserError"/>
61109
</test>
62110
</tests>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<data name="user/data/password_confirmation" xsi:type="string">123123q</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>
2223
<constraint name="Magento\Security\Test\Constraint\AssertUserIsLocked" />
2324
</variation>
2425
</testCase>

0 commit comments

Comments
 (0)