From 2387b46ba1f09b259e94583021ec2e139f78c02e Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 5 Jun 2018 03:32:15 +0200
Subject: [PATCH] Resolve className and id conflicts

---
 .../Community/components/RejectUsernameDialog.js   | 10 +++++-----
 test/e2e/page_objects/admin.js                     | 14 +++++++-------
 test/e2e/specs/04_userStatus.js                    |  7 ++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
index e25db4a34..0673256e0 100644
--- a/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
+++ b/client/coral-admin/src/routes/Community/components/RejectUsernameDialog.js
@@ -71,7 +71,7 @@ class RejectUsernameDialog extends Component {
       <Dialog
         className={cn(
           styles.suspendDialog,
-          'talk-admin-reject-username-dialog'
+          'talk-admin-reject-reported-username-dialog'
         )}
         id="rejectUsernameDialog"
         open={open}
@@ -85,7 +85,7 @@ class RejectUsernameDialog extends Component {
         <div
           className={cn(
             styles.container,
-            `talk-admin-reject-username-dialog-step-${stage}`
+            `talk-admin-reject-reported-username-dialog-step-${stage}`
           )}
         >
           <div className={styles.description}>
@@ -101,7 +101,7 @@ class RejectUsernameDialog extends Component {
                   <div className={styles.emailContainer}>
                     <textarea
                       rows={5}
-                      className={cn(styles.emailInput, 'talk-admin-reject-username-dialog-suspension-message')}
+                      className={cn(styles.emailInput, 'talk-admin-reject-reported-username-dialog-suspension-message')}
                       value={this.state.email}
                       onChange={this.onEmailChange}/>
                   </div>
@@ -110,7 +110,7 @@ class RejectUsernameDialog extends Component {
           <div
             className={cn(
               styles.modalButtons,
-              'talk-admin-reject-username-dialog-buttons'
+              'talk-admin-reject-reported-username-dialog-buttons'
             )}
           >
             {Object.keys(stages[stage].options).map((key, i) => (
@@ -118,7 +118,7 @@ class RejectUsernameDialog extends Component {
                 key={i}
                 className={cn(
                   'talk-admin-username-dialog-button',
-                  `talk-admin-reject-username-dialog-button-${key}`
+                  `talk-admin-reject-reported-username-dialog-button-${key}`
                 )}
                 onClick={this.onActionClick(stage, i)}
               >
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 64d22c97b..d436eddc7 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -57,15 +57,15 @@ module.exports = {
         sendButton: '.talk-admin-suspend-user-dialog-send',
       },
     },
-    usernameDialog: {
-      selector: '.talk-admin-reject-username-dialog',
+    rejectReportedUsernameDialog: {
+      selector: '.talk-admin-reject-reported-username-dialog',
       elements: {
-        step0: '.talk-admin-reject-username-dialog-step-0',
-        step1: '.talk-admin-reject-username-dialog-step-1',
-        buttons: '.talk-admin-reject-username-dialog-buttons',
-        suspend: '.talk-admin-reject-username-dialog-button-k',
+        step0: '.talk-admin-reject-reported-username-dialog-step-0',
+        step1: '.talk-admin-reject-reported-username-dialog-step-1',
+        buttons: '.talk-admin-reject-reported-username-dialog-buttons',
+        suspend: '.talk-admin-reject-reported-username-dialog-button-k',
         suspensionMessage:
-          '.talk-admin-reject-username-dialog-suspension-message',
+          '.talk-admin-reject-reported-username-dialog-suspension-message',
       },
     },
     moderate: {
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index c54aa308c..dfcb3548c 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -64,11 +64,12 @@ module.exports = {
       .waitForElementVisible('@flaggedUserRejectButton')
       .click('@flaggedUserRejectButton');
   },
-  'Admin suspends the user': client => {
+  'Admin continues the dialog and suspends the user': client => {
     const community = client.page.admin().section.community;
-    const usernameDialog = client.page.admin().section.usernameDialog;
+    const rejectReportedUsernameDialog = client.page.admin().section
+      .rejectReportedUsernameDialog;
 
-    usernameDialog
+    rejectReportedUsernameDialog
       .waitForElementVisible('@buttons')
       .waitForElementVisible('@step0')
       .waitForElementVisible('@suspend')