summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoh5 <doo@mattermost.com>2017-05-02 06:50:41 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-05-02 07:50:41 -0400
commit294bd0825550cd8de557a8b36facfc601f32bd82 (patch)
treefbf861e3a8ef3aeb4ae7cc3a6beaf4d2a28278fa
parent581bd8637fa860fa26f60d8089c5d6e3f613d23f (diff)
downloadchat-294bd0825550cd8de557a8b36facfc601f32bd82.tar.gz
chat-294bd0825550cd8de557a8b36facfc601f32bd82.tar.bz2
chat-294bd0825550cd8de557a8b36facfc601f32bd82.zip
Add IDs to system_users_dropdown and manage_teams_dropdown (#6274)
* Add IDs to system_users_dropdown * Add IDs to manage_teams_dropdown For UI Automation * Update system_users_dropdown.jsx * Update manage_teams_dropdown.jsx
-rw-r--r--webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx15
-rw-r--r--webapp/components/admin_console/system_users/system_users_dropdown.jsx9
2 files changed, 21 insertions, 3 deletions
diff --git a/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
index 798d61f46..e9ddf621c 100644
--- a/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
+++ b/webapp/components/admin_console/manage_teams_modal/manage_teams_dropdown.jsx
@@ -91,7 +91,10 @@ export default class ManageTeamsDropdown extends React.Component {
let makeTeamAdmin = null;
if (!isTeamAdmin) {
makeTeamAdmin = (
- <MenuItem onSelect={this.makeTeamAdmin}>
+ <MenuItem
+ id='makeTeamAdmin'
+ onSelect={this.makeTeamAdmin}
+ >
<FormattedMessage
id='admin.user_item.makeTeamAdmin'
defaultMessage='Make Team Admin'
@@ -103,7 +106,10 @@ export default class ManageTeamsDropdown extends React.Component {
let makeMember = null;
if (isTeamAdmin) {
makeMember = (
- <MenuItem onSelect={this.makeMember}>
+ <MenuItem
+ id='makeMember'
+ onSelect={this.makeMember}
+ >
<FormattedMessage
id='admin.user_item.makeMember'
defaultMessage='Make Member'
@@ -124,7 +130,10 @@ export default class ManageTeamsDropdown extends React.Component {
<Dropdown.Menu>
{makeTeamAdmin}
{makeMember}
- <MenuItem onSelect={this.removeFromTeam}>
+ <MenuItem
+ id='removeFromTeam'
+ onSelect={this.removeFromTeam}
+ >
<FormattedMessage
id='team_members_dropdown.leave_team'
defaultMessage='Remove from Team'
diff --git a/webapp/components/admin_console/system_users/system_users_dropdown.jsx b/webapp/components/admin_console/system_users/system_users_dropdown.jsx
index b3667bb89..15761564e 100644
--- a/webapp/components/admin_console/system_users/system_users_dropdown.jsx
+++ b/webapp/components/admin_console/system_users/system_users_dropdown.jsx
@@ -270,6 +270,7 @@ export default class SystemUsersDropdown extends React.Component {
makeSystemAdmin = (
<li role='presentation'>
<a
+ id='makeSystemAdmin'
role='menuitem'
href='#'
onClick={this.handleMakeSystemAdmin}
@@ -288,6 +289,7 @@ export default class SystemUsersDropdown extends React.Component {
makeMember = (
<li role='presentation'>
<a
+ id='makeMember'
role='menuitem'
href='#'
onClick={this.handleMakeMember}
@@ -314,6 +316,7 @@ export default class SystemUsersDropdown extends React.Component {
className={menuClass}
>
<a
+ id='activate'
role='menuitem'
href='#'
onClick={this.handleMakeActive}
@@ -335,6 +338,7 @@ export default class SystemUsersDropdown extends React.Component {
className={menuClass}
>
<a
+ id='deactivate'
role='menuitem'
href='#'
onClick={this.handleShowDeactivateMemberModal}
@@ -353,6 +357,7 @@ export default class SystemUsersDropdown extends React.Component {
manageTeams = (
<li role='presentation'>
<a
+ id='manageTeams'
role='menuitem'
href='#'
onClick={this.handleManageTeams}
@@ -371,6 +376,7 @@ export default class SystemUsersDropdown extends React.Component {
mfaReset = (
<li role='presentation'>
<a
+ id='removeMFA'
role='menuitem'
href='#'
onClick={this.handleResetMfa}
@@ -389,6 +395,7 @@ export default class SystemUsersDropdown extends React.Component {
passwordReset = (
<li role='presentation'>
<a
+ id='switchEmailPassword'
role='menuitem'
href='#'
onClick={this.handleResetPassword}
@@ -404,6 +411,7 @@ export default class SystemUsersDropdown extends React.Component {
passwordReset = (
<li role='presentation'>
<a
+ id='resetPassword'
role='menuitem'
href='#'
onClick={this.handleResetPassword}
@@ -474,6 +482,7 @@ export default class SystemUsersDropdown extends React.Component {
return (
<div className='dropdown member-drop'>
<a
+ id='memberDropdown'
href='#'
className='dropdown-toggle theme'
type='button'