fix tests

RocketChat · Feb 22, 2018 · 5d41a67 · 5d41a67
1 parent 88bea8d
commit 5d41a67
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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'); }