Skip to content

Commit da4f432

Browse files
KevinBKozanKevinBKozan
committed
MQE-1889: [MTF-To-MFTF] Process PR #717
- Reverted BIC actiongroup change - Changed actionGroup to extend existing - Moved test materials from incorrect modules back into correct module - added cleanup steps
1 parent d32285c commit da4f432

9 files changed

+69
-53
lines changed

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

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<!--Create new user with role-->
3737
<actionGroup name="AdminCreateUserWithRoleActionGroup">
3838
<arguments>
39+
<argument name="role"/>
3940
<argument name="user" defaultValue="newAdmin"/>
4041
</arguments>
4142
<amOnPage url="{{AdminNewUserPage.url}}" stepKey="navigateToNewUser"/>
@@ -49,32 +50,9 @@
4950
<fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
5051
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
5152
<click stepKey="clickUserRole" selector="{{AdminCreateUserSection.userRoleTab}}"/>
52-
<checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(user.role)}}" stepKey="assignRole"/>
53+
<click stepKey="chooseRole" selector="{{AdminStoreSection.createdRoleInUserPage(role.name)}}"/>
5354
<click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
5455
<waitForPageLoad stepKey="waitForSaveTheUser" />
5556
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
5657
</actionGroup>
57-
58-
<!--Create new user with role and active/inactive setting-->
59-
<actionGroup name="AdminCreateUserWithRoleAndIsActiveActionGroup">
60-
<arguments>
61-
<argument name="user" defaultValue="newAdmin"/>
62-
</arguments>
63-
<amOnPage url="{{AdminNewUserPage.url}}" stepKey="navigateToNewUser"/>
64-
<waitForPageLoad stepKey="waitForUsersPage" />
65-
<fillField selector="{{AdminNewUserFormSection.username}}" userInput="{{user.username}}" stepKey="enterUserName" />
66-
<fillField selector="{{AdminNewUserFormSection.firstname}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />
67-
<fillField selector="{{AdminNewUserFormSection.lastname}}" userInput="{{user.lastName}}" stepKey="enterLastName" />
68-
<fillField selector="{{AdminNewUserFormSection.email}}" userInput="{{user.username}}@magento.com" stepKey="enterEmail" />
69-
<fillField selector="{{AdminNewUserFormSection.password}}" userInput="{{user.password}}" stepKey="enterPassword" />
70-
<fillField selector="{{AdminNewUserFormSection.passwordConfirmation}}" userInput="{{user.password}}" stepKey="confirmPassword" />
71-
<checkOption selector="{{AdminNewUserFormSection.userIsActive(user.is_active)}}" stepKey="checkIsActive" />
72-
<fillField selector="{{AdminNewUserFormSection.currentPassword}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
73-
<scrollToTopOfPage stepKey="scrollToTopOfPage" />
74-
<click stepKey="clickUserRole" selector="{{AdminNewUserFormSection.userRoleTab}}"/>
75-
<checkOption selector="{{AdminNewUserFormSection.roleRadiobutton(user.role)}}" stepKey="assignRole"/>
76-
<click selector="{{AdminNewUserFormSection.save}}" stepKey="clickSaveUser" />
77-
<waitForPageLoad stepKey="waitForSaveTheUser" />
78-
<see userInput="You saved the user." stepKey="seeSuccessMessage" />
79-
</actionGroup>
8058
</actionGroups>

‎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: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -74,36 +74,12 @@
7474
<item>1</item>
7575
</array>
7676
</entity>
77-
<entity name="activeAdmin" type="user">
78-
<data key="username" unique="suffix">AdminUser</data>
79-
<data key="firstname" unique="suffix">FirstName</data>
80-
<data key="lastname" unique="suffix">LastName</data>
81-
<data key="email" unique="prefix">admin@example.com</data>
82-
<data key="password">123123q</data>
83-
<data key="password_confirmation">123123q</data>
84-
<data key="interface_local">en_US</data>
85-
<data key="interface_local_label">English (United States)</data>
77+
<entity name="activeAdmin" type="user" extends="NewAdminUser">
78+
<data key="name" unique="suffix">admin</data>
8679
<data key="is_active">1</data>
87-
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
88-
<data key="role">Administrators</data>
89-
<array key="roles">
90-
<item>1</item>
91-
</array>
9280
</entity>
93-
<entity name="inactiveAdmin" type="user">
94-
<data key="username" unique="suffix">AdminUser</data>
95-
<data key="firstname" unique="suffix">FirstName</data>
96-
<data key="lastname" unique="suffix">LastName</data>
97-
<data key="email" unique="prefix">admin@example.com</data>
98-
<data key="password">123123q</data>
99-
<data key="password_confirmation">123123q</data>
100-
<data key="interface_local">en_US</data>
101-
<data key="interface_local_label">English (United States)</data>
81+
<entity name="inactiveAdmin" type="user" extends="NewAdminUser">
82+
<data key="name" unique="suffix">admin</data>
10283
<data key="is_active">0</data>
103-
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
104-
<data key="role">Administrators</data>
105-
<array key="roles">
106-
<item>1</item>
107-
</array>
10884
</entity>
10985
</entities>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,8 @@
2424
<data key="resourceAccess">Custom</data>
2525
<data key="resources">['Magento_Sales::sales','Magento_Sales::sales_operation','Magento_Sales::actions','Magento_Sales::sales_order','Magento_Sales::create','Magento_Sales::actions_view','Magento_Sales::email','Magento_Sales::reorder','Magento_Sales::actions_edit','Magento_Sales::cancel','Magento_Sales::review_payment','Magento_Sales::capture','Magento_Sales::invoice','Magento_Sales::creditmemo','Magento_Sales::hold','Magento_Sales::unhold','Magento_Sales::ship','Magento_Sales::comment','Magento_Sales::emails','Magento_Backend::system','Magento_Backend::system_other_settings','Magento_AdminNotification::adminnotification','Magento_AdminNotification::show_list']</data>
2626
</entity>
27+
28+
<entity name="genericAdminRole" type="role">
29+
<data key="name">Administrators</data>
30+
</entity>
2731
</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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +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='{{var}}']" parameterized="true"/>
22+
<element name="userIsActive" type="select" selector="#page_tabs_main_section_content select[id='user_is_active'] > option[value='{{isActive}}']" parameterized="true"/>
2323
<element name="currentPassword" type="input" selector="#page_tabs_main_section_content input[name='current_password']"/>
2424

2525
<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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@
2222
<before>
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</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>
2531

2632
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33+
<argument name="role" value="genericAdminRole"/>
2734
<argument name="user" value="activeAdmin"/>
2835
</actionGroup>
2936
<actionGroup ref="logout" stepKey="logoutMasterAdmin"/>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,15 @@
2222
<before>
2323
<actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
2424
</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>
2531

2632
<actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
33+
<argument name="role" value="genericAdminRole"/>
2734
<argument name="user" value="inactiveAdmin"/>
2835
</actionGroup>
2936
<amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>

0 commit comments

Comments
 (0)