Skip to content

Commit 9e82e91

Browse files
lfolcolfolco
committed
add MFTF test for creating new user with invalid expiration date (#22833)
1 parent 60f5710 commit 9e82e91

6 files changed

+79
-11
lines changed

‎app/code/Magento/Security/Test/Mftf/ActionGroup/AdminCreateNewUserWithUserExpirationActionGroup.xml renamed to ‎app/code/Magento/Security/Test/Mftf/ActionGroup/AdminCreateNewUserWithExpirationActionGroup.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
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="AdminCreateNewUserWithUserExpirationActionGroup">
10+
<actionGroup name="AdminCreateNewUserWithExpirationActionGroup">
1211
<annotations>
1312
<description>Goes to the Admin Users grid page. Clicks on Create User. Fills in the provided User with an expiration date and saves.</description>
1413
</annotations>
@@ -28,7 +27,5 @@
2827
<fillField selector="{{AdminNewUserFormSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
2928
<click selector="{{AdminNewUserFormSection.save}}" stepKey="clickSaveUser" />
3029
<waitForPageLoad stepKey="waitForSaveTheUser" />
31-
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
32-
3330
</actionGroup>
3431
</actionGroups>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="AdminSaveUserInvalidExpirationActionGroup">
11+
<annotations>
12+
<description>Error message for saving an admin user with an invalid expiration date.</description>
13+
</annotations>
14+
<see selector="{{AdminMessagesSection.errorMessage}}" userInput='"Expiration date" must be later than the current date.' stepKey="seeErrorMessage"/>
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="AdminSaveUserSuccessActionGroup">
11+
<annotations>
12+
<description>Success message for saving an admin user successfully.</description>
13+
</annotations>
14+
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
1112
<entity name="NewAdminUserWithValidExpiration" type="user">
12-
<data key="username" unique="suffix">adminExpired</data>
13+
<data key="username" unique="suffix">adminExpiresAt</data>
1314
<data key="firstname">John</data>
1415
<data key="lastname">Doe</data>
1516
<data key="email" unique="prefix">[email protected]</data>
@@ -26,4 +27,8 @@
2627
<item>1</item>
2728
</array>
2829
</entity>
30+
31+
<entity name="NewAdminUserWithInvalidExpiration" type="user" extends="NewAdminUserWithValidExpiration">
32+
<data key="expires_at">Sep 3, 2000 4:42:36 PM</data>
33+
</entity>
2934
</entities>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminUserCreateNewUserWithInvalidExpirationTest">
11+
<annotations>
12+
<features value="Security"/>
13+
<stories value="Create new user with invalid expiration date."/>
14+
<title value="Create new user with invalid expiration date"/>
15+
<description value="Create new user with invalid expiration date."/>
16+
<testCaseId value="" />
17+
<severity value="CRITICAL"/>
18+
<group value="security_userexpiration"/>
19+
</annotations>
20+
<before>
21+
<!-- Log in to Admin Panel -->
22+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
23+
</before>
24+
25+
<!-- Create new user with user expiration set -->
26+
<actionGroup ref="AdminCreateNewUserWithExpirationActionGroup" stepKey="fillInNewUserWithInvalidExpiration">
27+
<argument name="user" value="NewAdminUserWithInvalidExpiration" />
28+
</actionGroup>
29+
30+
<actionGroup ref="AdminSaveUserInvalidExpirationActionGroup" stepKey="saveNewUserWithInvalidExpirationError" />
31+
</test>
32+
</tests>

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,26 @@
77
-->
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10-
<test name="AdminUserCreateNewUserWithExpirationTest">
10+
<test name="AdminUserCreateNewUserWithValidExpirationTest">
1111
<annotations>
1212
<features value="Security"/>
13-
<stories value="Create new user with expiration date."/>
14-
<title value="Create new user with expiration date"/>
15-
<description value="Create new user with expiration date."/>
13+
<stories value="Create new user with valid expiration date."/>
14+
<title value="Create new user with valid expiration date"/>
15+
<description value="Create new user with valid expiration date."/>
1616
<testCaseId value="" />
1717
<severity value="CRITICAL"/>
18-
<group value="security"/>
18+
<group value="security_userexpiration"/>
1919
</annotations>
2020
<before>
2121
<!-- Log in to Admin Panel -->
2222
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2323
</before>
2424

2525
<!-- Create new user with user expiration set -->
26-
<actionGroup ref="AdminCreateNewUserWithUserExpirationActionGroup" stepKey="createNewUserWithValidExpiration">
26+
<actionGroup ref="AdminCreateNewUserWithExpirationActionGroup" stepKey="fillInNewUserWithValidExpiration">
2727
<argument name="user" value="NewAdminUserWithValidExpiration" />
2828
</actionGroup>
29+
30+
<actionGroup ref="AdminSaveUserSuccessActionGroup" stepKey="saveNewUserWithValidExpirationSuccess" />
2931
</test>
3032
</tests>

0 commit comments

Comments
 (0)