Skip to content

Commit 81da262

Browse files
KevinBKozanKevinBKozan
committed
Merge branch 'pr717' into MTF-MFTF-migration-kozan
2 parents 61f037c + 273af89 commit 81da262

8 files changed

+156
-0
lines changed

‎app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserWithRoleAndIsActiveActionGroup.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+
<!--Create new user with role and active setting-->
11+
<actionGroup name="AdminCreateUserWithRoleAndIsActiveActionGroup" extends="AdminCreateUserWithRoleActionGroup">
12+
<checkOption selector="{{AdminNewUserFormSection.userIsActive(user.is_active)}}" stepKey="checkIsActive" after="confirmPassword"/>
13+
</actionGroup>
14+
</actionGroups>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,16 @@
114114
<item>1</item>
115115
</array>
116116
</entity>
117+
118+
<entity name="activeAdmin" type="user" extends="NewAdminUser">
119+
<data key="name" unique="suffix">admin</data>
120+
<data key="is_active">1</data>
121+
</entity>
122+
<entity name="inactiveAdmin" type="user" extends="NewAdminUser">
123+
<data key="name" unique="suffix">admin</data>
124+
<data key="is_active">0</data>
125+
</entity>
126+
117127
<entity name="adminUserCorrectPassword" type="user">
118128
<data key="username">admin_user_with_correct_password</data>
119129
<data key="firstname">John</data>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,8 @@
9999
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
100100
<data key="all">0</data>
101101
</entity>
102+
103+
<entity name="genericAdminRole" type="role">
104+
<data key="name">Administrators</data>
105+
</entity>
102106
</entities>

‎app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.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+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminDeleteUserSection">
12+
<element name="role" parameterized="true" selector="//td[contains(text(), '{{roleName}}')]" type="button"/>
13+
<element name="password" selector="#user_current_password" type="input"/>
14+
<element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
15+
<element name="confirm" selector=".action-primary.action-accept" type="button"/>
16+
</section>
17+
</sections>

‎app/code/Magento/User/Test/Mftf/Section/AdminNewUserFormSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<element name="password" type="input" selector="#page_tabs_main_section_content input[name='password']"/>
2020
<element name="passwordConfirmation" type="input" selector="#page_tabs_main_section_content input[name='password_confirmation']"/>
2121
<element name="interfaceLocale" type="select" selector="#page_tabs_main_section_content select[name='interface_locale']"/>
22+
<element name="userIsActive" type="select" selector="#page_tabs_main_section_content select[id='user_is_active'] > option[value='{{isActive}}']" parameterized="true"/>
2223
<element name="currentPassword" type="input" selector="#page_tabs_main_section_content input[name='current_password']"/>
2324

2425
<element name="userRoleTab" type="button" selector="#page_tabs_roles_section"/>

‎app/code/Magento/User/Test/Mftf/Section/AdminStoreSection.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
10+
<section name="AdminStoreSection">
11+
<element name="createdRoleInUserPage" type="text" selector="//tr//td[contains(text(), '{{roleName}}')]" parameterized="true"/>
12+
</section>
13+
</sections>

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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="AdminCreateActiveUserEntityTest">
12+
<annotations>
13+
<features value="User"/>
14+
<stories value="Create Admin User"/>
15+
<title value="Admin user should be able to create active admin user"/>
16+
<description value="Admin user should be able to create active admin user"/>
17+
<testCaseId value=""/>
18+
<severity value="CRITICAL"/>
19+
<group value="user"/>
20+
<group value="mtf_migrated"/>
21+
</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="activeAdmin"/>
29+
</actionGroup>
30+
</after>
31+
32+
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33+
<argument name="role" value="genericAdminRole"/>
34+
<argument name="user" value="activeAdmin"/>
35+
</actionGroup>
36+
<actionGroup ref="logout" 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"/>
42+
<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"/>
47+
<actionGroup ref="logout" stepKey="logoutCreatedUser"/>
48+
</test>
49+
</tests>

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
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="AdminCreateInactiveUserEntityTest">
12+
<annotations>
13+
<features value="User"/>
14+
<stories value="Create Admin User"/>
15+
<title value="Admin user should be able to create inactive admin user"/>
16+
<description value="Admin user should be able to create inactive admin user"/>
17+
<testCaseId value=""/>
18+
<severity value="CRITICAL"/>
19+
<group value="user"/>
20+
<group value="mtf_migrated"/>
21+
</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>
31+
32+
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33+
<argument name="role" value="genericAdminRole"/>
34+
<argument name="user" value="inactiveAdmin"/>
35+
</actionGroup>
36+
<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="logout" 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"/>
46+
<actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeUserErrorMessage" />
47+
</test>
48+
</tests>

0 commit comments

Comments
 (0)