Resolve className and id conflicts

This commit is contained in:
Chi Vinh Le
2018-06-05 03:32:15 +02:00
parent 375c8789a4
commit 2387b46ba1
3 changed files with 16 additions and 15 deletions
@@ -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)}
>
+7 -7
View File
@@ -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: {
+4 -3
View File
@@ -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')