Skip to content

Commit 332c4b1

Browse files
okolesnykokolesnyk
committed
Minor fixes for magento-commerce/magento-functional-tests-migration#382: Convert LockAdminUserWhenCreatingNewUserTest to MFTF
- add test case id and move some files
1 parent f1561c6 commit 332c4b1

15 files changed

+238
-190
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
@@ -13,6 +13,5 @@
1313
<element name="password" type="input" selector="#login"/>
1414
<element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
1515
<element name="forgotPasswordLink" type="button" selector=".action-forgotpassword" timeout="10"/>
16-
<element name="error" type="text" selector=".message.message-error.error"/>
1716
</section>
1817
</sections>

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

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

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

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

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

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

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

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminUserLockWhenCreatingNewUserTest">
12+
<annotations>
13+
<features value="Security"/>
14+
<stories value="Runs Lock admin user when creating new user test."/>
15+
<title value="Lock admin user when creating new user"/>
16+
<description value="Runs Lock admin user when creating new user test."/>
17+
<testCaseId value="MC-14383" />
18+
<severity value="CRITICAL"/>
19+
<group value="security"/>
20+
<group value="mtf_migrated"/>
21+
</annotations>
22+
<before>
23+
<!-- Log in to Admin Panel -->
24+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<!-- Unlock Admin user -->
28+
<magentoCLI command="admin:user:unlock {{DefaultAdminUser.username}}" stepKey="unlockAdminUser"/>
29+
</after>
30+
31+
<!-- Open Admin New User Page -->
32+
<actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="openNewUserPage" />
33+
34+
<!-- Perform add new admin user 6 specified number of times.
35+
"The password entered for the current user is invalid. Verify the password and try again." appears after each attempt.-->
36+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFirstAttempt">
37+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
38+
</actionGroup>
39+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFirstAttempt" />
40+
<actionGroup ref="AssertAdminUserSaveMessageActionGroup" stepKey="seeInvalidPasswordError">
41+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again." />
42+
<argument name="messageType" value="error" />
43+
</actionGroup>
44+
45+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserSecondAttempt">
46+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
47+
</actionGroup>
48+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveSecondAttempt" />
49+
50+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserThirdAttempt">
51+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
52+
</actionGroup>
53+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveThirdAttempt" />
54+
55+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFourthAttempt">
56+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
57+
</actionGroup>
58+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFourthAttempt" />
59+
60+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserFifthAttempt">
61+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
62+
</actionGroup>
63+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveFifthAttempt" />
64+
65+
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="failedSaveUserSixthAttempt">
66+
<argument name="user" value="NewAdminUserWrongCurrentPassword" />
67+
</actionGroup>
68+
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="clickSaveSixthAttempt" />
69+
70+
<!-- Check Error that account has been locked -->
71+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeLockUserErrorMessage">
72+
<argument name="message" value="Your account is temporarily disabled. Please try again later." />
73+
</actionGroup>
74+
75+
<!-- Try to login as admin and check error -->
76+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
77+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeLoginUserErrorMessage" />
78+
</test>
79+
</tests>

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

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

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminClickSaveButtonOnUserFormActionGroup.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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminClickSaveButtonOnUserFormActionGroup">
11+
<click selector="{{AdminNewUserFormSection.save}}" stepKey="saveNewUser"/>
12+
<waitForPageLoad stepKey="waitForSaveResultLoad"/>
13+
</actionGroup>
14+
</actionGroups>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<argument name="role"/>
4040
<argument name="user" defaultValue="newAdmin"/>
4141
</arguments>
42-
<amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
42+
<amOnPage url="{{AdminNewUserPage.url}}" stepKey="navigateToNewUser"/>
4343
<waitForPageLoad stepKey="waitForUsersPage" />
4444
<fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
4545
<fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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="AdminFillNewUserFormRequiredFieldsActionGroup">
11+
<arguments>
12+
<argument name="user" type="entity" />
13+
</arguments>
14+
<fillField selector="{{AdminNewUserFormSection.username}}" userInput="{{user.username}}" stepKey="fillUser"/>
15+
<fillField selector="{{AdminNewUserFormSection.firstname}}" userInput="{{user.firstname}}" stepKey="fillFirstName"/>
16+
<fillField selector="{{AdminNewUserFormSection.lastname}}" userInput="{{user.lastname}}" stepKey="fillLastName"/>
17+
<fillField selector="{{AdminNewUserFormSection.email}}" userInput="{{user.email}}" stepKey="fillEmail"/>
18+
<fillField selector="{{AdminNewUserFormSection.password}}" userInput="{{user.password}}" stepKey="fillPassword"/>
19+
<fillField selector="{{AdminNewUserFormSection.passwordConfirmation}}" userInput="{{user.password_confirmation}}" stepKey="fillPasswordConfirmation"/>
20+
<fillField selector="{{AdminNewUserFormSection.currentPassword}}" userInput="{{user.current_password}}" stepKey="fillCurrentUserPassword"/>
21+
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
22+
<click selector="{{AdminNewUserFormSection.userRoleTab}}" stepKey="openUserRoleTab"/>
23+
<waitForPageLoad stepKey="waitForUserRoleTabOpened" />
24+
<click selector="{{AdminNewUserFormSection.resetFilter}}" stepKey="resetGridFilter" />
25+
<waitForPageLoad stepKey="waitForFiltersReset" />
26+
<fillField userInput="{{user.role}}" selector="{{AdminNewUserFormSection.roleFilterField}}" stepKey="fillRoleFilterField" />
27+
<click selector="{{AdminNewUserFormSection.search}}" stepKey="clickSearchButton" />
28+
<waitForPageLoad stepKey="waitForFiltersApplied" />
29+
<checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(user.role)}}" stepKey="assignRole"/>
30+
</actionGroup>
31+
</actionGroups>

0 commit comments

Comments
 (0)