From 5d41a67b14d375fb6330e481b016c39323eec5d2 Mon Sep 17 00:00:00 2001 From: Karl Prieb Date: Thu, 22 Feb 2018 16:21:17 -0300 Subject: [PATCH] fix tests --- packages/rocketchat-ui-sidenav/client/sidebarHeader.js | 2 +- tests/end-to-end/ui/11-admin.js | 2 +- tests/end-to-end/ui/12-settings.js | 2 +- tests/pageobjects/side-nav.page.js | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js index 23e92f7fea76..a85a76a0e3df 100644 --- a/packages/rocketchat-ui-sidenav/client/sidebarHeader.js +++ b/packages/rocketchat-ui-sidenav/client/sidebarHeader.js @@ -1,4 +1,4 @@ -/* globals popover isRtl menu */ +/* globals popover menu */ const setStatus = status => { AccountBox.setStatus(status); RocketChat.callbacks.run('userStatusManuallySet', status); diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js index 4db35c992377..422b14504644 100644 --- a/tests/end-to-end/ui/11-admin.js +++ b/tests/end-to-end/ui/11-admin.js @@ -24,7 +24,7 @@ describe('[Administration]', () => { describe('[Admin View]', () => { before(() => { - sideNav.sidebarUserMenu.click(); + sideNav.sidebarMenu.click(); sideNav.admin.waitForVisible(5000); }); diff --git a/tests/end-to-end/ui/12-settings.js b/tests/end-to-end/ui/12-settings.js index e27af333e535..56876fb62218 100644 --- a/tests/end-to-end/ui/12-settings.js +++ b/tests/end-to-end/ui/12-settings.js @@ -474,7 +474,7 @@ describe('[Api Settings Change]', () => { it('login as admin and go to users', () => { checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword); - sideNav.sidebarUserMenu.click(); + sideNav.sidebarMenu.click(); sideNav.admin.waitForVisible(5000); sideNav.admin.click(); admin.usersLink.waitForVisible(5000); diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js index c87c6e6f7359..2d5dcac2c93f 100644 --- a/tests/pageobjects/side-nav.page.js +++ b/tests/pageobjects/side-nav.page.js @@ -13,7 +13,8 @@ class SideNav extends Page { get accountBoxUserAvatar() { return browser.element('.sidebar__account .avatar-image'); } get accountMenu() { return browser.element('.sidebar__account'); } get sidebarHeader() { return browser.element('.sidebar__header'); } - get sidebarUserMenu() { return browser.element('.sidebar__toolbar-button-icon--menu'); } + get sidebarUserMenu() { return browser.element('.sidebar__header .avatar'); } + get sidebarMenu() { return browser.element('.sidebar__toolbar-button-icon--menu'); } get popOverContent() { return browser.element('.rc-popover__content'); } get statusOnline() { return browser.element('.rc-popover__item--online'); } get statusAway() { return browser.element('.rc-popover__item--away'); }