From f543ff886266359135317fc0af5cee105438fc10 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Mon, 10 Dec 2018 21:24:22 +0800
Subject: [PATCH] revert channel header IDs for selenium testing compatibility
 (#2160)

---
 .../menu_items/__snapshots__/add_members.test.js.snap           | 1 +
 .../menu_items/__snapshots__/convert_channel.test.js.snap       | 1 +
 .../__snapshots__/notification_preferences.test.js.snap         | 1 +
 .../menu_items/__snapshots__/rename_channel.test.js.snap        | 1 +
 .../menu_items/__snapshots__/set_channel_header.test.js.snap    | 2 +-
 .../menu_items/__snapshots__/set_channel_purpose.test.js.snap   | 1 +
 .../__snapshots__/view_and_manage_members.test.js.snap          | 2 ++
 .../menu_items/__snapshots__/view_channel_info.test.js.snap     | 1 +
 components/channel_header_dropdown/menu_items/add_members.js    | 1 +
 .../close_channel/__snapshots__/close_channel.test.js.snap      | 1 +
 .../menu_items/close_channel/close_channel.js                   | 1 +
 .../channel_header_dropdown/menu_items/convert_channel.js       | 1 +
 .../delete_channel/__snapshots__/delete_channel.test.js.snap    | 1 +
 .../menu_items/delete_channel/delete_channel.js                 | 1 +
 .../leave_channel/__snapshots__/leave_channel.test.js.snap      | 1 +
 .../menu_items/leave_channel/leave_channel.js                   | 1 +
 .../menu_items/notification_preferences.js                      | 1 +
 components/channel_header_dropdown/menu_items/rename_channel.js | 1 +
 .../channel_header_dropdown/menu_items/set_channel_header.js    | 2 +-
 .../channel_header_dropdown/menu_items/set_channel_purpose.js   | 1 +
 .../__snapshots__/toggle_mute_channel.test.js.snap              | 1 +
 .../menu_items/toggle_mute_channel/toggle_mute_channel.js       | 1 +
 .../menu_items/view_and_manage_members.js                       | 1 +
 .../channel_header_dropdown/menu_items/view_channel_info.js     | 1 +
 24 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/add_members.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/add_members.test.js.snap
index 9a302e6ed..b12b2c94b 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/add_members.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/add_members.test.js.snap
@@ -24,6 +24,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.AddMembers should match snaps
         }
       }
       dialogType={[Function]}
+      id="channelAddMembers"
       modalId="channel_invite"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/convert_channel.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/convert_channel.test.js.snap
index 0f03bf96c..860411e34 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/convert_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/convert_channel.test.js.snap
@@ -20,6 +20,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.ConvertChannel should match s
         }
       }
       dialogType={[Function]}
+      id="channelConvert"
       modalId="convert_channel"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/notification_preferences.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/notification_preferences.test.js.snap
index 78f9c7a6d..cf59f93e3 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/notification_preferences.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/notification_preferences.test.js.snap
@@ -14,6 +14,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.NotificationPreferences shoul
       }
     }
     dialogType={[Function]}
+    id="channelNotifications"
     modalId="channel_notifications"
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/rename_channel.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/rename_channel.test.js.snap
index 4c741b858..74a926ce4 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/rename_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/rename_channel.test.js.snap
@@ -24,6 +24,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.RenameChannel should match sn
         }
       }
       dialogType={[Function]}
+      id="channelRename"
       modalId="rename_channel"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_header.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_header.test.js.snap
index 2b1651451..fccc7ff24 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_header.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_header.test.js.snap
@@ -24,7 +24,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.SetChannelHeader should match
         }
       }
       dialogType={[Function]}
-      id="editChannelHeader"
+      id="channelEditHeader"
       modalId="edit_channel_header"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_purpose.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_purpose.test.js.snap
index f30995d27..aa7a757eb 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_purpose.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/set_channel_purpose.test.js.snap
@@ -24,6 +24,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.SetChannelPurpose should matc
         }
       }
       dialogType={[Function]}
+      id="channelEditPurpose"
       modalId="edit_channel_purpose"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/view_and_manage_members.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/view_and_manage_members.test.js.snap
index e7983ad03..87c383d3f 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/view_and_manage_members.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/view_and_manage_members.test.js.snap
@@ -13,6 +13,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.ViewAndManageMembers should m
       }
     }
     dialogType={[Function]}
+    id="channelManageMembers"
     modalId="channel_members"
     role="menuitem"
   >
@@ -60,6 +61,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.ViewAndManageMembers should m
       }
     }
     dialogType={[Function]}
+    id="channelManageMembers"
     modalId="channel_members"
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/__snapshots__/view_channel_info.test.js.snap b/components/channel_header_dropdown/menu_items/__snapshots__/view_channel_info.test.js.snap
index 098ebcf95..d45656789 100644
--- a/components/channel_header_dropdown/menu_items/__snapshots__/view_channel_info.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/__snapshots__/view_channel_info.test.js.snap
@@ -13,6 +13,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.ViewChannelInfo should match
       }
     }
     dialogType={[Function]}
+    id="channelViewInfo"
     modalId="channel_info"
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/add_members.js b/components/channel_header_dropdown/menu_items/add_members.js
index 01c348090..65c39e6e0 100644
--- a/components/channel_header_dropdown/menu_items/add_members.js
+++ b/components/channel_header_dropdown/menu_items/add_members.js
@@ -39,6 +39,7 @@ const AddMembers = ({channel, isDefault, isArchived}) => {
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
+                    id='channelAddMembers'
                     role='menuitem'
                     modalId={ModalIdentifiers.CHANNEL_INVITE}
                     dialogType={ChannelInviteModal}
diff --git a/components/channel_header_dropdown/menu_items/close_channel/__snapshots__/close_channel.test.js.snap b/components/channel_header_dropdown/menu_items/close_channel/__snapshots__/close_channel.test.js.snap
index c07e37efa..4300697e8 100644
--- a/components/channel_header_dropdown/menu_items/close_channel/__snapshots__/close_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/close_channel/__snapshots__/close_channel.test.js.snap
@@ -6,6 +6,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.CloseChannel should match sna
 >
   <button
     className="style--none"
+    id="channelClose"
     onClick={[Function]}
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/close_channel/close_channel.js b/components/channel_header_dropdown/menu_items/close_channel/close_channel.js
index 35dd97068..83520a540 100644
--- a/components/channel_header_dropdown/menu_items/close_channel/close_channel.js
+++ b/components/channel_header_dropdown/menu_items/close_channel/close_channel.js
@@ -25,6 +25,7 @@ export default class CloseChannel extends React.PureComponent {
         return (
             <li role='presentation'>
                 <button
+                    id='channelClose'
                     className='style--none'
                     role='menuitem'
                     onClick={this.handleClose}
diff --git a/components/channel_header_dropdown/menu_items/convert_channel.js b/components/channel_header_dropdown/menu_items/convert_channel.js
index bdf38764d..f360b8f6b 100644
--- a/components/channel_header_dropdown/menu_items/convert_channel.js
+++ b/components/channel_header_dropdown/menu_items/convert_channel.js
@@ -28,6 +28,7 @@ const ConvertChannel = ({channel, isDefault, isArchived}) => {
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
+                    id='channelConvert'
                     role='menuitem'
                     modalId={ModalIdentifiers.CONVERT_CHANNEL}
                     dialogType={ConvertChannelModal}
diff --git a/components/channel_header_dropdown/menu_items/delete_channel/__snapshots__/delete_channel.test.js.snap b/components/channel_header_dropdown/menu_items/delete_channel/__snapshots__/delete_channel.test.js.snap
index d1598dbe7..f2dc2b644 100644
--- a/components/channel_header_dropdown/menu_items/delete_channel/__snapshots__/delete_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/delete_channel/__snapshots__/delete_channel.test.js.snap
@@ -25,6 +25,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.DeleteChannel should match sn
         }
       }
       dialogType={[Function]}
+      id="channelDelete"
       modalId="delete_channel"
       role="menuitem"
     >
diff --git a/components/channel_header_dropdown/menu_items/delete_channel/delete_channel.js b/components/channel_header_dropdown/menu_items/delete_channel/delete_channel.js
index c212ab717..3b0e9b4be 100644
--- a/components/channel_header_dropdown/menu_items/delete_channel/delete_channel.js
+++ b/components/channel_header_dropdown/menu_items/delete_channel/delete_channel.js
@@ -35,6 +35,7 @@ const DeleteChannel = ({channel, isDefault, isArchived, penultimateViewedChannel
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
+                    id='channelDelete'
                     role='menuitem'
                     modalId={ModalIdentifiers.DELETE_CHANNEL}
                     dialogType={DeleteChannelModal}
diff --git a/components/channel_header_dropdown/menu_items/leave_channel/__snapshots__/leave_channel.test.js.snap b/components/channel_header_dropdown/menu_items/leave_channel/__snapshots__/leave_channel.test.js.snap
index 0f66d420c..d012a6134 100644
--- a/components/channel_header_dropdown/menu_items/leave_channel/__snapshots__/leave_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/leave_channel/__snapshots__/leave_channel.test.js.snap
@@ -6,6 +6,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.LeaveChannel should match sna
 >
   <button
     className="style--none"
+    id="channelLeave"
     onClick={[Function]}
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/leave_channel/leave_channel.js b/components/channel_header_dropdown/menu_items/leave_channel/leave_channel.js
index 222534e81..47acc0a24 100644
--- a/components/channel_header_dropdown/menu_items/leave_channel/leave_channel.js
+++ b/components/channel_header_dropdown/menu_items/leave_channel/leave_channel.js
@@ -68,6 +68,7 @@ export default class LeaveChannel extends React.PureComponent {
         return (
             <li role='presentation'>
                 <button
+                    id='channelLeave'
                     role='menuitem'
                     className='style--none'
                     onClick={this.handleLeave}
diff --git a/components/channel_header_dropdown/menu_items/notification_preferences.js b/components/channel_header_dropdown/menu_items/notification_preferences.js
index f6e150f62..9abde6db8 100644
--- a/components/channel_header_dropdown/menu_items/notification_preferences.js
+++ b/components/channel_header_dropdown/menu_items/notification_preferences.js
@@ -23,6 +23,7 @@ const NotificationPreferences = ({user, channel, isArchived}) => {
     return (
         <li role='presentation'>
             <ToggleModalButtonRedux
+                id='channelNotifications'
                 role='menuitem'
                 modalId={ModalIdentifiers.CHANNEL_NOTIFICATIONS}
                 dialogType={ChannelNotificationsModal}
diff --git a/components/channel_header_dropdown/menu_items/rename_channel.js b/components/channel_header_dropdown/menu_items/rename_channel.js
index b858340fe..a849caabe 100644
--- a/components/channel_header_dropdown/menu_items/rename_channel.js
+++ b/components/channel_header_dropdown/menu_items/rename_channel.js
@@ -35,6 +35,7 @@ const RenameChannel = ({channel, isArchived}) => {
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
+                    id='channelRename'
                     role='menuitem'
                     modalId={ModalIdentifiers.RENAME_CHANNEL}
                     dialogType={RenameChannelModal}
diff --git a/components/channel_header_dropdown/menu_items/set_channel_header.js b/components/channel_header_dropdown/menu_items/set_channel_header.js
index 44f435381..6836f03ae 100644
--- a/components/channel_header_dropdown/menu_items/set_channel_header.js
+++ b/components/channel_header_dropdown/menu_items/set_channel_header.js
@@ -31,7 +31,7 @@ const SetChannelHeader = ({channel, isArchived, isReadonly}) => {
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
-                    id='editChannelHeader'
+                    id='channelEditHeader'
                     role='menuitem'
                     modalId={ModalIdentifiers.EDIT_CHANNEL_HEADER}
                     dialogType={EditChannelHeaderModal}
diff --git a/components/channel_header_dropdown/menu_items/set_channel_purpose.js b/components/channel_header_dropdown/menu_items/set_channel_purpose.js
index 4e4c23c13..1f59186f9 100644
--- a/components/channel_header_dropdown/menu_items/set_channel_purpose.js
+++ b/components/channel_header_dropdown/menu_items/set_channel_purpose.js
@@ -39,6 +39,7 @@ const SetChannelPurpose = ({channel, isArchived, isReadonly}) => {
         >
             <li role='presentation'>
                 <ToggleModalButtonRedux
+                    id='channelEditPurpose'
                     role='menuitem'
                     modalId={ModalIdentifiers.EDIT_CHANNEL_PURPOSE}
                     dialogType={EditChannelPurposeModal}
diff --git a/components/channel_header_dropdown/menu_items/toggle_mute_channel/__snapshots__/toggle_mute_channel.test.js.snap b/components/channel_header_dropdown/menu_items/toggle_mute_channel/__snapshots__/toggle_mute_channel.test.js.snap
index 50b01aaf1..254161d6b 100644
--- a/components/channel_header_dropdown/menu_items/toggle_mute_channel/__snapshots__/toggle_mute_channel.test.js.snap
+++ b/components/channel_header_dropdown/menu_items/toggle_mute_channel/__snapshots__/toggle_mute_channel.test.js.snap
@@ -6,6 +6,7 @@ exports[`components/ChannelHeaderDropdown/MenuItem.ToggleMuteChannel should matc
 >
   <button
     className="style--none"
+    id="channelMute"
     onClick={[Function]}
     role="menuitem"
   >
diff --git a/components/channel_header_dropdown/menu_items/toggle_mute_channel/toggle_mute_channel.js b/components/channel_header_dropdown/menu_items/toggle_mute_channel/toggle_mute_channel.js
index 993c8dcbc..acadaae07 100644
--- a/components/channel_header_dropdown/menu_items/toggle_mute_channel/toggle_mute_channel.js
+++ b/components/channel_header_dropdown/menu_items/toggle_mute_channel/toggle_mute_channel.js
@@ -73,6 +73,7 @@ export default class ToggleMuteChannel extends React.PureComponent {
         return (
             <li role='presentation'>
                 <button
+                    id='channelMute'
                     className='style--none'
                     role='menuitem'
                     onClick={this.handleClick}
diff --git a/components/channel_header_dropdown/menu_items/view_and_manage_members.js b/components/channel_header_dropdown/menu_items/view_and_manage_members.js
index cd08f1bd1..00b5a9910 100644
--- a/components/channel_header_dropdown/menu_items/view_and_manage_members.js
+++ b/components/channel_header_dropdown/menu_items/view_and_manage_members.js
@@ -27,6 +27,7 @@ const ViewAndManageMembers = ({channel, isDefault}) => {
     return (
         <li role='presentation'>
             <ToggleModalButtonRedux
+                id={'channelManageMembers'}
                 role='menuitem'
                 modalId={ModalIdentifiers.CHANNEL_MEMBERS}
                 dialogType={ChannelMembersModal}
diff --git a/components/channel_header_dropdown/menu_items/view_channel_info.js b/components/channel_header_dropdown/menu_items/view_channel_info.js
index 3c73b4564..d9f144962 100644
--- a/components/channel_header_dropdown/menu_items/view_channel_info.js
+++ b/components/channel_header_dropdown/menu_items/view_channel_info.js
@@ -22,6 +22,7 @@ const ViewChannelInfo = ({channel}) => {
     return (
         <li role='presentation'>
             <ToggleModalButtonRedux
+                id='channelViewInfo'
                 role='menuitem'
                 modalId={ModalIdentifiers.CHANNEL_INFO}
                 dialogType={ChannelInfoModal}
-- 
GitLab