Skip to content

Commit 0f98f13

Browse files
okolesnykokolesnyk
committed
Merge branch 'issue-308-create-admin-user-role' of https://github.com/kate-kyzyma/magento-functional-tests-migration into 2.4-develop-community
2 parents 58f9a56 + 542bcb8 commit 0f98f13

File tree

5 files changed

+122
-1
lines changed

5 files changed

+122
-1
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertAdminRoleInGridActionGroup">
11+
<arguments>
12+
<argument name="roleName" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToRolesGrid"/>
15+
<fillField selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{roleName}}" stepKey="enterRoleName"/>
16+
<click selector="{{AdminRoleGridSection.searchButton}}" stepKey="clickSearch"/>
17+
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
18+
<see selector="{{AdminRoleGridSection.roleNameInFirstRow}}" userInput="{{roleName}}" stepKey="seeTheRole"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AssertAdminRoleNotInGridActionGroup">
11+
<arguments>
12+
<argument name="roleName" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToRolesGrid"/>
15+
<fillField selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{roleName}}" stepKey="enterRoleName"/>
16+
<click selector="{{AdminRoleGridSection.searchButton}}" stepKey="clickSearch"/>
17+
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
18+
<see selector="{{AdminRoleGridSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
19+
</actionGroup>
20+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="resetButton" type="button" selector="button[title='Reset Filter']"/>
1515
<element name="roleNameInFirstRow" type="text" selector=".col-role_name"/>
1616
<element name="searchResultFirstRow" type="text" selector=".data-grid&gt;tbody&gt;tr"/>
17+
<element name="emptyRecords" type="text" selector="//tr[@class='data-grid-tr-no-data even']/td[@class='empty-text']"/>
1718
</section>
1819
</sections>

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

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
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="AdminCreateUserRoleEntityTest">
12+
<annotations>
13+
<features value="User"/>
14+
<stories value="Create User Role"/>
15+
<title value="Creating a new role with different data sets"/>
16+
<description value="Creating a new role with different data sets"/>
17+
<group value="user"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
21+
<before>
22+
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
23+
</before>
24+
<after>
25+
<actionGroup ref="logout" stepKey="logOut"/>
26+
</after>
27+
28+
<!--Create a new role with custom access-->
29+
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
30+
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
31+
<argument name="role" value="roleSales"/>
32+
</actionGroup>
33+
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
34+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
35+
<argument name="message" value="You saved the role."/>
36+
</actionGroup>
37+
<actionGroup ref="AssertAdminRoleInGridActionGroup" stepKey="assertRoleInGrid">
38+
<argument name="roleName" value="{{roleSales.name}}"/>
39+
</actionGroup>
40+
<!--Delete the new role with custom access-->
41+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteSaleRole">
42+
<argument name="roleName" value="{{roleSales.name}}"/>
43+
</actionGroup>
44+
45+
<!--Create a new role with full access-->
46+
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePageSecondTime"/>
47+
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleFormSecondTime">
48+
<argument name="role" value="roleAdministrator"/>
49+
</actionGroup>
50+
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRoleSecondTime"/>
51+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessageSecondTime">
52+
<argument name="message" value="You saved the role."/>
53+
</actionGroup>
54+
<actionGroup ref="AssertAdminRoleInGridActionGroup" stepKey="assertRoleInGridSecondTime">
55+
<argument name="roleName" value="{{roleAdministrator.name}}"/>
56+
</actionGroup>
57+
<!--Delete the new role with full access-->
58+
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteAdministratorRole">
59+
<argument name="roleName" value="{{roleAdministrator.name}}"/>
60+
</actionGroup>
61+
62+
<!--Create a new role using incorrect current_password-->
63+
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePageThirdTime"/>
64+
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleFormThirdTime">
65+
<argument name="role" value="roleAdministrator"/>
66+
<argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID"/>
67+
</actionGroup>
68+
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRoleThirdTime"/>
69+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
70+
<argument name="messageType" value="error"/>
71+
<argument name="message" value="The password entered for the current user is invalid. Verify the password and try again."/>
72+
</actionGroup>
73+
<actionGroup ref="AssertAdminRoleNotInGridActionGroup" stepKey="assertRoleNotInGrid">
74+
<argument name="roleName" value="{{roleAdministrator.name}}"/>
75+
</actionGroup>
76+
77+
</test>
78+
</tests>

‎dev/tests/functional/tests/app/Magento/User/Test/TestCase/CreateAdminUserRoleEntityTest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\User\Test\TestCase\CreateAdminUserRoleEntityTest" summary="Create Admin User Role" ticketId="MAGETWO-23413">
1010
<variation name="CreateAdminUserRoleEntityTestVariation1">
11-
<data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
11+
<data name="tag" xsi:type="string">test_type:extended_acceptance_test, mftf_migrated:yes</data>
1212
<data name="role/data/rolename" xsi:type="string">AdminRole%isolation%</data>
1313
<data name="role/data/current_password" xsi:type="string">%current_password%</data>
1414
<data name="role/data/resource_access" xsi:type="string">Custom</data>
@@ -22,13 +22,15 @@
2222
<data name="role/data/resource_access" xsi:type="string">All</data>
2323
<constraint name="Magento\User\Test\Constraint\AssertRoleSuccessSaveMessage" />
2424
<constraint name="Magento\User\Test\Constraint\AssertRoleInGrid" />
25+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
2526
</variation>
2627
<variation name="CreateAdminUserRoleEntityTestVariation3">
2728
<data name="role/data/rolename" xsi:type="string">AdminRole%isolation%</data>
2829
<data name="role/data/current_password" xsi:type="string">incorrect password</data>
2930
<data name="role/data/resource_access" xsi:type="string">All</data>
3031
<constraint name="Magento\User\Test\Constraint\AssertIncorrectUserPassword" />
3132
<constraint name="Magento\User\Test\Constraint\AssertRoleNotInGrid" />
33+
<data name="tag" xsi:type="string">mftf_migrated:yes</data>
3234
</variation>
3335
</testCase>
3436
</config>

0 commit comments

Comments
 (0)