Skip to content

Commit 3e7648a

Browse files
okolesnykokolesnyk
committed
Merge branch 'issue-316-delete-admin-user-entity' of https://github.com/kate-kyzyma/magento-functional-tests-migration into 2.4-develop-community
2 parents eaff9ac + d6b94f6 commit 3e7648a

File tree

11 files changed

+777
-0
lines changed

11 files changed

+777
-0
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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="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" />
15+
<click selector="{{AdminMainActionsSection.delete}}" stepKey="deleteUser"/>
16+
<waitForElementVisible selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForConfirmModal"/>
17+
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmDelete"/>
18+
<waitForElementVisible selector="{{AdminMessagesSection.error}}" stepKey="waitErrorMessage"/>
19+
<see selector="{{AdminMessagesSection.error}}" userInput="You cannot delete your own account." stepKey="seeErrorMessage"/>
20+
</actionGroup>
21+
</actionGroups>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AssertAdminUserInGridActionGroup">
11+
<arguments>
12+
<argument name="userName" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUsersGrid"/>
15+
<click selector="{{AdminUserGridSection.resetButton}}" stepKey="resetGridFilter"/>
16+
<waitForPageLoad stepKey="waitForFiltersReset"/>
17+
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{userName}}" stepKey="enterUserName"/>
18+
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch"/>
19+
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
20+
<see selector="{{AdminUserGridSection.usernameInFirstRow}}" userInput="{{userName}}" stepKey="seeUser"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AssertAdminUserNotInGridActionGroup">
11+
<arguments>
12+
<argument name="userName" type="string"/>
13+
</arguments>
14+
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToUsersGrid"/>
15+
<click selector="{{AdminUserGridSection.resetButton}}" stepKey="resetGridFilter"/>
16+
<waitForPageLoad stepKey="waitForFiltersReset"/>
17+
<fillField selector="{{AdminUserGridSection.usernameFilterTextField}}" userInput="{{userName}}" stepKey="enterUserName"/>
18+
<click selector="{{AdminUserGridSection.searchButton}}" stepKey="clickSearch"/>
19+
<waitForPageLoad stepKey="waitForGridToLoad" time="15"/>
20+
<see selector="{{AdminUserGridSection.emptyRecords}}" userInput="We couldn't find any records." stepKey="seeEmptyRecordMessage"/>
21+
</actionGroup>
22+
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
<element name="usernameInFirstRow" type="text" selector=".col-username"/>
1515
<element name="searchResultFirstRow" type="text" selector=".data-grid&gt;tbody&gt;tr"/>
1616
<element name="successMessage" type="text" selector=".message-success"/>
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/AdminDeleteAdminUserEntityTest.xml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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="AdminDeleteAdminUserEntityTest">
12+
<annotations>
13+
<features value="User"/>
14+
<stories value="Delete Admin User"/>
15+
<title value="Admin user is able to delete a user account"/>
16+
<description value="Admin user is able to delete a user 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+
28+
<actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
29+
</before>
30+
31+
<after>
32+
<actionGroup ref="logout" stepKey="logOut"/>
33+
</after>
34+
35+
<!--Delete New Admin User-->
36+
<actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">
37+
<argument name="user" value="$$user$$"/>
38+
</actionGroup>
39+
<actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
40+
<argument name="message" value="You deleted the user."/>
41+
</actionGroup>
42+
<actionGroup ref="AssertAdminUserNotInGridActionGroup" stepKey="assertUserNotInGrid">
43+
<argument name="userName" value="$$user.username$$"/>
44+
</actionGroup>
45+
</test>
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)