diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js index a549df672..b73c1f0e1 100644 --- a/test/e2e/page_objects/admin.js +++ b/test/e2e/page_objects/admin.js @@ -33,6 +33,12 @@ module.exports = { .waitForElementVisible('@signOutButton') .click('@signOutButton'); }, + navigateAndLogin(user) { + this + .navigate() + .expect.section('@login').to.be.visible; + return this.section.login.login(user); + }, }], elements: { 'drawerButton': '.mdl-layout__drawer-button', @@ -113,6 +119,7 @@ module.exports = { this.parent .click('@drawerOverlay') .waitForElementNotPresent('@drawerOverlay'); + return this.parent; }, }], elements: { diff --git a/test/e2e/specs/02_admin.js b/test/e2e/specs/02_admin.js index 90b14934d..29957e487 100644 --- a/test/e2e/specs/02_admin.js +++ b/test/e2e/specs/02_admin.js @@ -20,9 +20,7 @@ module.exports = { const adminPage = client.page.admin(); const {testData: {admin}} = client.globals; - adminPage.navigate(); - adminPage.expect.section('@login').to.be.visible; - adminPage.section.login.login(admin); + adminPage.navigateAndLogin(admin); }, 'Admin goes to Stories': (client) => { diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js index ce28a1e4d..5a7593e53 100644 --- a/test/e2e/specs/04_userStatus.js +++ b/test/e2e/specs/04_userStatus.js @@ -19,12 +19,7 @@ module.exports = { const adminPage = client.page.admin(); const {testData: {admin}} = client.globals; - adminPage - .navigate() - .expect.section('@login').to.be.visible; - - adminPage.section.login - .login(admin); + adminPage.navigateAndLogin(admin); }, 'admin flags user\'s username as offensive': (client) => { const embedStream = client.page.embedStream(); diff --git a/test/e2e/specs/05_banUser.js b/test/e2e/specs/05_banUser.js index 512e2deed..da0d11e7a 100644 --- a/test/e2e/specs/05_banUser.js +++ b/test/e2e/specs/05_banUser.js @@ -19,12 +19,7 @@ module.exports = { const adminPage = client.page.admin(); const {testData: {admin}} = client.globals; - adminPage - .navigate() - .expect.section('@login').to.be.visible; - - adminPage.section.login - .login(admin); + adminPage.navigateAndLogin(admin); }, 'navigate to the embed stream': (client) => { const embedStream = client.page.embedStream(); @@ -81,12 +76,7 @@ module.exports = { const adminPage = client.page.admin(); const {testData: {admin}} = client.globals; - adminPage - .navigate() - .expect.section('@login').to.be.visible; - - adminPage.section.login - .login(admin); + adminPage.navigateAndLogin(admin); }, 'admin goes to community': (client) => { const adminPage = client.page.admin();