Refactor 2

test/e2e/specs/02_admin.js

@@ -8,37 +8,25 @@ module.exports = {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
 
-    adminPage
-      .navigate()
-      .ready()
-      .login(admin);
+    adminPage.navigate();
+    adminPage.expect.section('@login').to.be.present;
+    adminPage.section.login.login(admin);
   },
 
   'Admin goes to Stories': (client) => {
     const adminPage = client.page.admin();
 
     adminPage
-      .waitForElementVisible('@drawerButton')
-      .click('@drawerButton')
-      .waitForElementVisible('@storiesDrawerNav')
-      .click('@storiesDrawerNav')
-      .waitForElementVisible('@drawerOverlay')
-      .click('@drawerOverlay')
-      .waitForElementVisible('@storiesSection');
-
+      .openDrawer()
+        .goToStories();
   },
 
   'Admin goes to Community': (client) => {
     const adminPage = client.page.admin();
 
     adminPage
-      .waitForElementVisible('@drawerButton')
-      .click('@drawerButton')
-      .waitForElementVisible('@communityDrawerNav')
-      .click('@communityDrawerNav')
-      .waitForElementVisible('@drawerOverlay')
-      .click('@drawerOverlay')
-      .waitForElementVisible('@communitySection');
+      .openDrawer()
+        .goToCommunity();
   },
 
   after: (client) => {

test/e2e/specs/03_embedStream.js

@@ -21,8 +21,8 @@ module.exports = {
       .ready();
 
     comments
-      .openLoginPopup((login) => {
-        login.register(user);
+      .openLoginPopup((popup) => {
+        popup.register(user);
       });
   },
   'user posts a comment': (client) => {

test/e2e/specs/04_userStatus.js

@@ -1,11 +1,16 @@
 module.exports = {
+   beforeEach: (client) => {
+    client.resizeWindow(1600, 1200);
+  },
   'admin logs in': (client) => {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
 
     adminPage
       .navigate()
-      .ready()
+      .expect.section('@login').to.be.present;
+
+    adminPage.section.login
       .login(admin);
   },
   'admin flags user\'s username as offensive': (client) => {
@@ -32,25 +37,26 @@ module.exports = {
       .click('@continueButton');
   },
   'admin goes to Reported Usernames': (client) => {
-    const community = client.page.adminCommunity();
+    const adminPage = client.page.admin();
+
+    const community = adminPage
+      .navigate()
+      .ready()
+      .goToCommunity();
 
     community
-      .navigate();
-
-    community
-      .waitForElementVisible('@container')
       .waitForElementVisible('@flaggedAccountsContainer')
       .waitForElementVisible('@flaggedUser');
   },
   'admin rejects the user flag': (client) => {
-    const community = client.page.adminCommunity();
+    const community = client.page.admin().section.community;
 
     community
       .waitForElementVisible('@flaggedUserRejectButton')
       .click('@flaggedUserRejectButton');
   },
   'admin suspends the user': (client) => {
-    const community = client.page.adminCommunity();
+    const community = client.page.admin().section.community;
 
     community
       .waitForElementVisible('@usernameDialog')
@@ -62,13 +68,7 @@ module.exports = {
       .waitForElementNotPresent('@flaggedUser');
   },
   'admin logs out': (client) => {
-    const admin = client.page.admin();
-
-    admin
-      .waitForElementVisible('@settingsButton')
-      .click('@settingsButton')
-      .waitForElementVisible('@signOutButton')
-      .click('@signOutButton');
+    client.page.admin().logout();
   },
   'user logs in': (client) => {
     const {testData: {user}} = client.globals;

test/e2e/specs/05_banUser.js

@@ -5,7 +5,9 @@ module.exports = {
 
     adminPage
       .navigate()
-      .ready()
+      .expect.section('@login').to.be.present;
+
+    adminPage.section.login
       .login(admin);
   },
   'navigate to the embed stream': (client) => {
@@ -65,19 +67,24 @@ module.exports = {
 
     adminPage
       .navigate()
-      .ready()
+      .expect.section('@login').to.be.present;
+
+    adminPage.section.login
       .login(admin);
   },
   'admin goes to community': (client) => {
-    const community = client.page.adminCommunity();
+    const adminPage = client.page.admin();
 
-    community
-      .goToPeople();
+    adminPage
+      .goToCommunity()
+        .goToPeople();
   },
   'admin removes ban from user': (client) => {
-    const modSection = client.page.adminCommunity().section.people;
+    const people = client.page.admin()
+      .section.community
+      .section.people;
 
-    modSection
+    people
       .waitForElementVisible('@firstRow')
       .waitForElementVisible('@dropdownStatus')
       .click('@dropdownStatus')