Bring back register and resolution tests

tests/end-to-end/ui/02-forgot-password.js

@@ -2,7 +2,7 @@
 
 import loginPage from '../../pageobjects/login.page';
 
-describe.skip('register', () => {
+describe('register', () => {
 	before(() => {
 		loginPage.open();
 		loginPage.gotToForgotPassword();

tests/end-to-end/ui/08-resolutions.js

@@ -1,24 +1,24 @@
 /* eslint-env mocha */
 /* eslint-disable func-names, prefer-arrow-callback */
 
-import page from '../../pageobjects/Page';
+import Global from '../../pageobjects/global';
 import mainContent from '../../pageobjects/main-content.page';
 import sideNav from '../../pageobjects/side-nav.page';
 
 import {username, email, password} from '../../data/user.js';
 import {checkIfUserIsValid} from '../../data/checks';
 
-describe.skip('resolutions tests', ()=> {
+describe('resolutions tests', ()=> {
 	describe('mobile render', ()=> {
 		before(()=> {
 			checkIfUserIsValid(username, email, password);
 			sideNav.getChannelFromList('general').waitForExist(5000);
 			sideNav.openChannel('general');
-			page.setWindowSize(650, 800);
+			Global.setWindowSize(650, 800);
 		});
 
 		after(()=> {
-			page.setWindowSize(1450, 900);
+			Global.setWindowSize(1450, 900);
 		});
 
 		describe('moving elements ', () => {
@@ -27,7 +27,7 @@ describe.skip('resolutions tests', ()=> {
 			});
 
 			it('press the navbar button', () => {
-				sideNav.sideNavBtn.click();
+				sideNav.burgerBtn.click();
 			});
 
 			it('should open de sidenav', () => {
@@ -43,18 +43,18 @@ describe.skip('resolutions tests', ()=> {
 			});
 
 			it('press the navbar button', () => {
-				sideNav.sideNavBtn.click();
+				sideNav.burgerBtn.click();
 			});
 
 			it('opens the user preferences screen', () => {
-				sideNav.accountBoxUserName.waitForVisible();
+				sideNav.accountBoxUserName.waitForVisible(5000);
 				sideNav.accountBoxUserName.click();
-				sideNav.account.waitForVisible();
+				sideNav.account.waitForVisible(5000);
 				sideNav.account.click();
 			});
 
 			it('press the preferences link', () => {
-				sideNav.preferences.waitForVisible();
+				sideNav.preferences.waitForVisible(5000);
 				sideNav.preferences.click();
 			});
 
@@ -63,11 +63,11 @@ describe.skip('resolutions tests', ()=> {
 			});
 
 			it('press the navbar button', () => {
-				sideNav.sideNavBtn.click();
+				sideNav.burgerBtn.click();
 			});
 
 			it('press the profile link', () => {
-				sideNav.profile.waitForVisible();
+				sideNav.profile.waitForVisible(5000);
 				sideNav.profile.click();
 			});
 
@@ -76,11 +76,11 @@ describe.skip('resolutions tests', ()=> {
 			});
 
 			it('press the navbar button', () => {
-				sideNav.sideNavBtn.click();
+				sideNav.burgerBtn.click();
 			});
 
 			it('press the avatar link', () => {
-				sideNav.avatar.waitForVisible();
+				sideNav.avatar.waitForVisible(5000);
 				sideNav.avatar.click();
 			});
 
@@ -89,7 +89,7 @@ describe.skip('resolutions tests', ()=> {
 			});
 
 			it('press the navbar button', () => {
-				sideNav.sideNavBtn.click();
+				sideNav.burgerBtn.click();
 			});
 
 			it('close the preferences menu', () => {

tests/pageobjects/Page.js

@@ -11,12 +11,5 @@ class Page {
 
 		this.body.waitForExist();
 	}
-
-	setWindowSize(width, height) {
-		browser.windowHandleSize({
-			width: width,
-			height: height
-		});
-	}
 }
 module.exports = Page;

tests/pageobjects/global.js

@@ -11,6 +11,13 @@ class Global {
 		this.sweetAlertConfirm.click();
 		this.sweetAlert.waitForVisible(5000, true);
 	}
+
+	setWindowSize(width, height) {
+		browser.windowHandleSize({
+			width: width,
+			height: height
+		});
+	}
 }
 
 module.exports = new Global();

tests/pageobjects/side-nav.page.js

@@ -7,6 +7,7 @@ class SideNav extends Page {
 	get saveChannelBtn() { return browser.element('.save-channel'); }
 
 	get messageInput() { return browser.element('.input-message'); }
+	get burgerBtn() { return browser.element('.burger'); }
 
 	get accountBoxUserName() { return browser.element('.account-box .data h4'); }
 	get accountBoxUserAvatar() { return browser.element('.account-box .avatar-image'); }
@@ -30,9 +31,9 @@ class SideNav extends Page {
 	get logout() { return browser.element('#logout'); }
 	get sideNavBar() { return browser.element('.side-nav '); }
 
-	get preferences() { return browser.element('.account-link:nth-of-type(1)'); }
-	get profile() { return browser.element('.account-link:nth-of-type(2)'); }
-	get avatar() { return browser.element('.account-link:nth-of-type(3)'); }
+	get preferences() { return browser.element('[href="/account/preferences"]'); }
+	get profile() { return browser.element('[href="/account/profile"]'); }
+	get avatar() { return browser.element('[href="/changeavatar"]'); }
 	get preferencesClose() { return browser.element('.side-nav .arrow.close'); }
 	get spotlightSearch() { return browser.element('.toolbar-search__input'); }
 	get spotlightSearchPopUp() { return browser.element('.toolbar .message-popup'); }