From 07052824d7a431975b34d9208dd535e0c2d6f8f9 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 9 Jan 2018 10:10:37 -0300
Subject: [PATCH] updated tests

---
 test/e2e/page_objects/admin.js  | 16 ++++++++++------
 test/e2e/specs/04_userStatus.js | 19 +++++++++----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 1903ae7e8..99e393cec 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -59,16 +59,20 @@ module.exports = {
     suspendUserDialogStep1: '.talk-admin-suspend-user-dialog-step-1',
     suspendUserConfirmButton: '.talk-admin-suspend-user-dialog-confirm',
     supendUserSendButton: '.talk-admin-suspend-user-dialog-send',
-    usernameDialog: '.talk-admin-reject-username-dialog',
-    usernameDialogStep0: '.talk-admin-reject-username-dialog-step-0',
-    usernameDialogStep1: '.talk-admin-reject-username-dialog-step-1',
-    usernameDialogButtons: '.talk-admin-reject-username-dialog-buttons',
-    usernameDialogSuspend: '.talk-admin-reject-username-dialog-button-k',
-    usernameDialogSuspensionMessage: '.talk-admin-reject-username-dialog-suspension-message',
     toast: '.toastify',
     toastClose: '.toastify__close',
   },
   sections: {
+    usernameDialog: {
+      selector: '.talk-admin-reject-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',
+        suspensionMessage: '.talk-admin-reject-username-dialog-suspension-message',
+      } 
+    },
     moderate: {
       selector: '.talk-admin-moderation-container',
       elements: {
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index ce9873f8c..f80d82651 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -63,18 +63,17 @@ module.exports = {
       .click('@flaggedUserRejectButton');
   },
   'admin suspends the user': (client) => {
-    const adminPage = client.page.admin();
     const community = client.page.admin().section.community;
+    const usernameDialog = client.page.admin().section.usernameDialog;
 
-    adminPage
-      .waitForElementVisible('@usernameDialog')
-      .waitForElementVisible('@usernameDialogButtons')
-      .waitForElementVisible('@usernameDialogStep0')   
-      .waitForElementVisible('@usernameDialogSuspend')   
-      .click('@usernameDialogSuspend')
-      .waitForElementVisible('@usernameDialogStep1')      
-      .waitForElementVisible('@usernameDialogSuspend')
-      .click('@usernameDialogSuspend');
+    usernameDialog
+      .waitForElementVisible('buttons')
+      .waitForElementVisible('@step0')   
+      .waitForElementVisible('@suspend')   
+      .click('@suspend')
+      .waitForElementVisible('@step1')      
+      .waitForElementVisible('@suspend')
+      .click('@suspend');
     
     community
       .waitForElementNotPresent('@flaggedUser');