Skip to content

Commit d6b94f6

Browse files
kate-kyzymakate-kyzyma
committed
Split the test into two separate testes, update action groups names
1 parent 18c1b77 commit d6b94f6

File tree

5 files changed

+76
-58
lines changed

5 files changed

+76
-58
lines changed

app/code/Magento/User/Test/Mftf/ActionGroup/AssertImpossibleDeleteYourOwnAccountActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminImpossibleDeleteYourOwnAccountActionGroup.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AssertImpossibleDeleteYourOwnAccountActionGroup">
11-
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterThePassword" />
10+
<actionGroup name="AssertAdminImpossibleDeleteYourOwnAccountActionGroup">
11+
<arguments>
12+
<argument name="currentAdminPassword" type="string" defaultValue="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
13+
</arguments>
14+
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{currentAdminPassword}}" stepKey="enterThePassword" />
1215
<click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
1316
<waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
1417
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
1518
<waitForElementVisible selector="{{AdminMessagesSection.error}}" stepKey="waitErrorMessage"/>
1619
<see selector="{{AdminMessagesSection.error}}" userInput="You cannot delete your own account." stepKey="seeErrorMessage"/>
1720
</actionGroup>
18-
</actionGroups>
21+
</actionGroups>

app/code/Magento/User/Test/Mftf/ActionGroup/AssertUserInGridActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AssertUserInGridActionGroup">
10+
<actionGroup name="AssertAdminUserInGridActionGroup">
1111
<arguments>
1212
<argument name="userName" type="string"/>
1313
</arguments>
@@ -19,4 +19,4 @@
1919
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
2020
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{userName}}" stepKey="seeUser"/>
2121
</actionGroup>
22-
</actionGroups>
22+
</actionGroups>

app/code/Magento/User/Test/Mftf/ActionGroup/AssertUserNotInGridActionGroup.xml renamed to app/code/Magento/User/Test/Mftf/ActionGroup/AssertAdminUserNotInGridActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10-
<actionGroup name="AssertUserNotInGridActionGroup">
10+
<actionGroup name="AssertAdminUserNotInGridActionGroup">
1111
<arguments>
1212
<argument name="userName" type="string"/>
1313
</arguments>
@@ -19,4 +19,4 @@
1919
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
2020
<see selector="{{AdminUserGridSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
2121
</actionGroup>
22-
</actionGroups>
22+
</actionGroups>

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

Lines changed: 14 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -12,72 +12,35 @@
1212
<annotations>
1313
<features value="User"/>
1414
<stories value="Delete Admin User"/>
15-
<title value="Admin user is not able to delete the own account"/>
16-
<description value="Admin user is not able to delete the own account"/>
15+
<title value="Admin user is able to delete a user account"/>
16+
<description value="Admin user is able to delete a user account"/>
1717
<group value="user"/>
1818
<group value="mtf_migrated"/>
1919
</annotations>
2020

2121
<before>
22+
<!--Create New Admin User-->
23+
<executeJS function="return '{{DefaultAdminUser.password}}'" stepKey="adminPassword" />
24+
<createData entity="NewAdminUser" stepKey="user">
25+
<field key="current_password">{$adminPassword}</field>
26+
</createData>
27+
2228
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
2329
</before>
30+
2431
<after>
2532
<actionGroup ref="logout" stepKey="logOut"/>
2633
</after>
2734

28-
<!--Create New User-->
29-
<actionGroup ref="AdminOpenNewUserPageActionGroup" stepKey="goToNewUserPage"/>
30-
<actionGroup ref="AdminFillNewUserFormRequiredFieldsActionGroup" stepKey="fillNewUserForm">
31-
<argument name="user" value="NewAdminUser"/>
32-
</actionGroup>
33-
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
34-
35-
<!--Create New Role-->
36-
<actionGroup ref="AdminOpenCreateRolePageActionGroup" stepKey="goToNewRolePage"/>
37-
<actionGroup ref="AdminFillUserRoleFormActionGroup" stepKey="fillNewRoleForm">
38-
<argument name="role" value="roleSales"/>
39-
</actionGroup>
40-
<actionGroup ref="AdminClickSaveButtonOnUserRoleFormActionGroup" stepKey="saveNewRole"/>
41-
42-
<!--Assign New Role-->
43-
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPage">
44-
<argument name="user" value="NewAdminUser"/>
45-
</actionGroup>
46-
<actionGroup ref="AdminUpdateUserRoleActionGroup" stepKey="assignNewUserRole">
47-
<argument name="roleName" value="{{roleSales.name}}"/>
48-
</actionGroup>
49-
<actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveUser"/>
50-
<actionGroup ref="logout" stepKey="logOutAsDefaultAdminUser"/>
51-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
52-
<argument name="adminUser" value="NewAdminUser"/>
53-
</actionGroup>
54-
55-
<!--Assert Impossible Delete Your Own Account-->
56-
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPageForDeleting">
57-
<argument name="user" value="NewAdminUser"/>
58-
</actionGroup>
59-
<actionGroup ref="AssertImpossibleDeleteYourOwnAccountActionGroup" stepKey="assertErrorMessage"/>
60-
<actionGroup ref="AssertUserInGridActionGroup" stepKey="assertUserInGrid">
61-
<argument name="userName" value="{{NewAdminUser.username}}"/>
62-
</actionGroup>
63-
64-
<actionGroup ref="logout" stepKey="logOutAsNewUser"/>
65-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
66-
67-
<!--Delete New Role-->
68-
<actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteCustomRole">
69-
<argument name="roleName" value="{{roleSales.name}}"/>
70-
</actionGroup>
71-
72-
<!--Delete New User-->
35+
<!--Delete New Admin User-->
7336
<actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
74-
<argument name="user" value="NewAdminUser"/>
37+
<argument name="user" value="$$user$$"/>
7538
</actionGroup>
7639
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
7740
<argument name="message" value="You deleted the user."/>
7841
</actionGroup>
79-
<actionGroup ref="AssertUserNotInGridActionGroup" stepKey="assertUserNotInGrid">
80-
<argument name="userName" value="{{NewAdminUser.username}}"/>
42+
<actionGroup ref="AssertAdminUserNotInGridActionGroup" stepKey="assertUserNotInGrid">
43+
<argument name="userName" value="$$user.username$$"/>
8144
</actionGroup>
8245
</test>
83-
</tests>
46+
</tests>

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
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="AdminDeleteOwnAdminUserAccountTest">
12+
<annotations>
13+
<features value="User"/>
14+
<stories value="Delete Admin User"/>
15+
<title value="Admin user is not able to delete the own account"/>
16+
<description value="Admin user is not able to delete the own account"/>
17+
<group value="user"/>
18+
<group value="mtf_migrated"/>
19+
</annotations>
20+
21+
<before>
22+
<!--Create New Admin User-->
23+
<executeJS function="return '{{DefaultAdminUser.password}}'" stepKey="adminPassword" />
24+
<createData entity="NewAdminUser" stepKey="user">
25+
<field key="current_password">{$adminPassword}</field>
26+
</createData>
27+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUser">
28+
<argument name="adminUser" value="$$user$$"/>
29+
</actionGroup>
30+
</before>
31+
<after>
32+
<!-- Delete New Admin User -->
33+
<actionGroup ref="LoginAsAdmin" stepKey="LoginAdmin"/>
34+
<actionGroup ref="AdminDeleteUserViaCurlActionGroup" stepKey="deleteUser">
35+
<argument name="user" value="$$user$$" />
36+
</actionGroup>
37+
<actionGroup ref="logout" stepKey="logOut"/>
38+
</after>
39+
40+
<!--Assert Impossible Delete Your Own Account-->
41+
<actionGroup ref="AdminOpenUserEditPageActionGroup" stepKey="openUserEditPageForDeleting">
42+
<argument name="user" value="$$user$$"/>
43+
</actionGroup>
44+
<actionGroup ref="AssertAdminImpossibleDeleteYourOwnAccountActionGroup" stepKey="assertErrorMessage">
45+
<argument name="currentAdminPassword" value="$$user.password$$"/>
46+
</actionGroup>
47+
<actionGroup ref="AssertAdminUserInGridActionGroup" stepKey="assertUserInGrid">
48+
<argument name="userName" value="$$user.username$$"/>
49+
</actionGroup>
50+
<actionGroup ref="logout" stepKey="logOutAsNewUser"/>
51+
</test>
52+
</tests>

0 commit comments

Comments
 (0)