From c516d9ddc8d439e9b2512d111c7cefc9f7b876fb Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 25 May 2017 13:52:16 -0300
Subject: [PATCH 01/10] test commit for travis

---
 .../rocketchat-ui-sidenav/client/toolbar.html |  2 +-
 .../end-to-end/ui/04-main-elements-render.js  |  1 +
 tests/pageobjects/side-nav.page.js            | 50 ++++++++++++-------
 3 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/packages/rocketchat-ui-sidenav/client/toolbar.html b/packages/rocketchat-ui-sidenav/client/toolbar.html
index 2f2449517463..356d752a6784 100644
--- a/packages/rocketchat-ui-sidenav/client/toolbar.html
+++ b/packages/rocketchat-ui-sidenav/client/toolbar.html
@@ -19,7 +19,7 @@
 
 <template name="toolbarSearchList">
 	<i class="{{icon}} {{userStatus}}"></i>
-	<span class="room-title {{#if unread}}bold{{/if}}">{{displayName}}</span>
+	<span class="room-title {{#if unread}}bold{{/if}}" name="{{displayName}}" >{{displayName}}</span>
 	{{#if unread}}
 		<span class="unread">{{unread}}</span>
 	{{/if}}
diff --git a/tests/end-to-end/ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js
index 05d6089c4163..c8b6fec1f2c3 100644
--- a/tests/end-to-end/ui/04-main-elements-render.js
+++ b/tests/end-to-end/ui/04-main-elements-render.js
@@ -27,6 +27,7 @@ describe('[Main Elements Render]', function() {
 			});
 
 			it('it should show the new channel button', () => {
+				sideNav.newChannelBtn.waitForVisible(5000);
 				sideNav.newChannelBtn.isVisible().should.be.true;
 			});
 
diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 601ded7a8707..d4dc1b88ff6f 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -46,31 +46,47 @@ class SideNav extends Page {
 		browser.click(`.rooms-list > .wrapper > ul [title="${ channelName }"]`);
 		browser.waitForVisible('.input-message', 5000);
 		browser.waitUntil(function() {
-			browser.waitForVisible('.room-title', 5000);
-			return browser.getText('.room-title') === channelName;
-		}, 5000);
+			browser.waitForVisible('.fixed-title .room-title', 8000);
+			return browser.getText('.fixed-title .room-title') === channelName;
+		}, 10000);
 	}
 
 	// Opens a channel via spotlight search
 	searchChannel(channelName) {
-		this.spotlightSearch.waitForVisible(5000);
-		this.spotlightSearch.click();
-		this.spotlightSearch.setValue(channelName);
-		browser.waitForVisible(`.room-title=${ channelName }`, 10000);
-		browser.click(`.room-title=${ channelName }`);
-		browser.waitUntil(function() {
-			browser.waitForVisible('.room-title', 5000);
-			return browser.getText('.room-title') === channelName;
-		}, 5000);
+		browser.waitForVisible('.fixed-title .room-title', 5000);
+		const currentRoom = browser.element('.fixed-title .room-title').getText();
+		if (currentRoom !== channelName) {
+			this.spotlightSearch.waitForVisible(5000);
+			this.spotlightSearch.click();
+			this.spotlightSearch.setValue(channelName);
+			// const room = browser.selectByVisibleText('.search.room-title', channelName);
+			// room.waitForVisible(5000);
+			// room.click();
+			browser.waitForVisible(`[name='${ channelName }']`, 5000);
+			browser.click(`[name='${ channelName }']`);
+			browser.waitUntil(function() {
+				browser.waitForVisible('.fixed-title .room-title', 8000);
+				return browser.getText('.fixed-title .room-title') === channelName;
+			}, 10000);
+		}
 	}
 
 	// Gets a channel from the spotlight search
 	getChannelFromSpotlight(channelName) {
-		this.spotlightSearch.waitForVisible(5000);
-		this.spotlightSearch.click();
-		this.spotlightSearch.setValue(channelName);
-		browser.waitForVisible(`.room-title=${ channelName }`, 5000);
-		return browser.element(`.room-title=${ channelName }`);
+		browser.waitForVisible('.fixed-title .room-title', 5000);
+		const currentRoom = browser.element('.fixed-title .room-title').getText();
+		if (currentRoom !== channelName) {
+			this.spotlightSearch.waitForVisible(5000);
+			this.spotlightSearch.click();
+			this.spotlightSearch.setValue(channelName);
+			browser.waitForVisible(`[name='${ channelName }']`, 5000);
+			return browser.element(`[name='${ channelName }']`);
+			// const room = browser.selectByValue('.search.room-title', channelName);
+			// room.waitForVisible(5000);
+			// return room;
+			// return browser.element(`.room-title=${ channelName }`);
+
+		}
 	}
 
 	// Gets a channel from the rooms list

From be569498a1f33e2016f582f821638145d2d8bf1d Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 25 May 2017 14:14:29 -0300
Subject: [PATCH 02/10] test

---
 tests/pageobjects/side-nav.page.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index d4dc1b88ff6f..5c590b37e899 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -53,7 +53,7 @@ class SideNav extends Page {
 
 	// Opens a channel via spotlight search
 	searchChannel(channelName) {
-		browser.waitForVisible('.fixed-title .room-title', 5000);
+		browser.waitForVisible('.fixed-title .room-title', 15000);
 		const currentRoom = browser.element('.fixed-title .room-title').getText();
 		if (currentRoom !== channelName) {
 			this.spotlightSearch.waitForVisible(5000);
@@ -73,7 +73,7 @@ class SideNav extends Page {
 
 	// Gets a channel from the spotlight search
 	getChannelFromSpotlight(channelName) {
-		browser.waitForVisible('.fixed-title .room-title', 5000);
+		browser.waitForVisible('.fixed-title .room-title', 15000);
 		const currentRoom = browser.element('.fixed-title .room-title').getText();
 		if (currentRoom !== channelName) {
 			this.spotlightSearch.waitForVisible(5000);

From 0beed5b4be3ef1ba702a6c83478581eb674330ae Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 25 May 2017 16:28:27 -0300
Subject: [PATCH 03/10] increase timeout

---
 tests/end-to-end/ui/04-main-elements-render.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end-to-end/ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js
index c8b6fec1f2c3..8e3ea95cb580 100644
--- a/tests/end-to-end/ui/04-main-elements-render.js
+++ b/tests/end-to-end/ui/04-main-elements-render.js
@@ -27,7 +27,7 @@ describe('[Main Elements Render]', function() {
 			});
 
 			it('it should show the new channel button', () => {
-				sideNav.newChannelBtn.waitForVisible(5000);
+				sideNav.newChannelBtn.waitForVisible(20000);
 				sideNav.newChannelBtn.isVisible().should.be.true;
 			});
 

From dce0d60ee39c82719a154cabcc7eb55644dec568 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Thu, 25 May 2017 16:36:13 -0300
Subject: [PATCH 04/10] try catch the error

---
 tests/pageobjects/side-nav.page.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 5c590b37e899..8c9cefff1840 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -64,10 +64,14 @@ class SideNav extends Page {
 			// room.click();
 			browser.waitForVisible(`[name='${ channelName }']`, 5000);
 			browser.click(`[name='${ channelName }']`);
-			browser.waitUntil(function() {
-				browser.waitForVisible('.fixed-title .room-title', 8000);
-				return browser.getText('.fixed-title .room-title') === channelName;
-			}, 10000);
+			try {
+				browser.waitUntil(function() {
+					browser.waitForVisible('.fixed-title .room-title', 8000);
+					return browser.getText('.fixed-title .room-title') === channelName;
+				}, 10000);
+			} catch (error) {
+				this.openChannel(channelName);
+			}
 		}
 	}
 

From ecce0446bdac389d9fbececcce06dab8eae28df2 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 26 May 2017 14:03:00 -0300
Subject: [PATCH 05/10] try to fix the test

---
 tests/end-to-end/ui/11-admin.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index a5d1ff480dd6..b0a8c9c1a519 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -13,7 +13,7 @@ describe('[Administration]', () => {
 	before(() => {
 		checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
 		sideNav.spotlightSearch.waitForVisible(10000);
-		sideNav.searchChannel('general');
+		sideNav.openChannel('general');
 	});
 
 	after(() => {

From d791740398089e2d593516844f342c887472cf6a Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 26 May 2017 14:03:00 -0300
Subject: [PATCH 06/10] try to fix the test

---
 tests/end-to-end/ui/11-admin.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index a5d1ff480dd6..b86c9944d106 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -13,7 +13,8 @@ describe('[Administration]', () => {
 	before(() => {
 		checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
 		sideNav.spotlightSearch.waitForVisible(10000);
-		sideNav.searchChannel('general');
+		sideNav.general.waitForVisible(5000);
+		sideNav.general.click();
 	});
 
 	after(() => {

From 54fe8faf4308900c45c8a55aa583cad862169ca7 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 26 May 2017 14:53:35 -0300
Subject: [PATCH 07/10] FIX

---
 tests/end-to-end/ui/13-permissions.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/end-to-end/ui/13-permissions.js b/tests/end-to-end/ui/13-permissions.js
index feabf0ccd646..f1f4bac4ae63 100644
--- a/tests/end-to-end/ui/13-permissions.js
+++ b/tests/end-to-end/ui/13-permissions.js
@@ -15,7 +15,8 @@ describe('[Permissions]', () => {
 	before(() => {
 		checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
 		sideNav.spotlightSearch.waitForVisible(10000);
-		sideNav.searchChannel('general');
+		sideNav.general.waitForVisible(5000);
+		sideNav.general.click();
 		sideNav.accountBoxUserName.waitForVisible(5000);
 		sideNav.accountBoxUserName.click();
 		sideNav.admin.waitForVisible(5000);
@@ -26,7 +27,8 @@ describe('[Permissions]', () => {
 	after(() => {
 		checkIfUserIsAdmin(adminUsername, adminEmail, adminPassword);
 		sideNav.spotlightSearch.waitForVisible(10000);
-		sideNav.searchChannel('general');
+		sideNav.general.waitForVisible(5000);
+		sideNav.general.click();
 		sideNav.accountBoxUserName.waitForVisible(5000);
 		sideNav.accountBoxUserName.click();
 		sideNav.admin.waitForVisible(5000);

From 67fcba35077745e6a97ae0748912f52cb8f4c02a Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 26 May 2017 15:11:46 -0300
Subject: [PATCH 08/10] fix

---
 tests/end-to-end/ui/12-settings.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/end-to-end/ui/12-settings.js b/tests/end-to-end/ui/12-settings.js
index 381a305b3112..11e9181fd513 100644
--- a/tests/end-to-end/ui/12-settings.js
+++ b/tests/end-to-end/ui/12-settings.js
@@ -48,7 +48,8 @@ describe('[Api Settings Change]', () => {
 	before((done) => {
 		checkIfUserIsValid(username, email, password);
 		sideNav.spotlightSearch.waitForVisible(10000);
-		sideNav.searchChannel('general');
+		sideNav.general.waitForVisible(5000);
+		sideNav.general.click();
 
 		request.post(api('login'))
 			.send(login)

From 391f62426a4e901894ce0fe1207dc52e930e3ce6 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Fri, 26 May 2017 16:14:27 -0300
Subject: [PATCH 09/10] clean up code

---
 tests/pageobjects/side-nav.page.js | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/tests/pageobjects/side-nav.page.js b/tests/pageobjects/side-nav.page.js
index 8c9cefff1840..23c0869d404f 100644
--- a/tests/pageobjects/side-nav.page.js
+++ b/tests/pageobjects/side-nav.page.js
@@ -59,19 +59,13 @@ class SideNav extends Page {
 			this.spotlightSearch.waitForVisible(5000);
 			this.spotlightSearch.click();
 			this.spotlightSearch.setValue(channelName);
-			// const room = browser.selectByVisibleText('.search.room-title', channelName);
-			// room.waitForVisible(5000);
-			// room.click();
 			browser.waitForVisible(`[name='${ channelName }']`, 5000);
 			browser.click(`[name='${ channelName }']`);
-			try {
-				browser.waitUntil(function() {
-					browser.waitForVisible('.fixed-title .room-title', 8000);
-					return browser.getText('.fixed-title .room-title') === channelName;
-				}, 10000);
-			} catch (error) {
-				this.openChannel(channelName);
-			}
+			browser.waitUntil(function() {
+				browser.waitForVisible('.fixed-title .room-title', 8000);
+				return browser.getText('.fixed-title .room-title') === channelName;
+			}, 10000);
+
 		}
 	}
 
@@ -85,11 +79,6 @@ class SideNav extends Page {
 			this.spotlightSearch.setValue(channelName);
 			browser.waitForVisible(`[name='${ channelName }']`, 5000);
 			return browser.element(`[name='${ channelName }']`);
-			// const room = browser.selectByValue('.search.room-title', channelName);
-			// room.waitForVisible(5000);
-			// return room;
-			// return browser.element(`.room-title=${ channelName }`);
-
 		}
 	}
 

From abc1816c6caf00de3869e1384734265a9d6a6471 Mon Sep 17 00:00:00 2001
From: Martin Schoeler <martin.schoeler@rocket.chat>
Date: Mon, 29 May 2017 10:19:38 -0300
Subject: [PATCH 10/10] increase timeouts on wait untils

---
 tests/pageobjects/main-content.page.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/pageobjects/main-content.page.js b/tests/pageobjects/main-content.page.js
index fa78dea7d105..c2f74089f4cc 100644
--- a/tests/pageobjects/main-content.page.js
+++ b/tests/pageobjects/main-content.page.js
@@ -73,7 +73,7 @@ class MainContent extends Page {
 		browser.waitUntil(function() {
 			browser.waitForVisible('.message:last-child .body', 5000);
 			return browser.getText('.message:last-child .body') === text;
-		}, 2000);
+		}, 5000);
 	}
 
 	// adds text to the input
@@ -98,14 +98,14 @@ class MainContent extends Page {
 		browser.waitUntil(function() {
 			browser.waitForVisible('.message:last-child .body', 5000);
 			return browser.getText('.message:last-child .body') === text;
-		}, 4000);
+		}, 5000);
 	}
 
 	waitForLastMessageTextAttachmentEqualsText(text) {
 		browser.waitUntil(function() {
 			browser.waitForVisible('.message:last-child .attachment-text', 5000);
 			return browser.getText('.message:last-child .attachment-text') === text;
-		}, 2000);
+		}, 5000);
 	}
 
 	// Wait for the last message author username to equal the provided text
@@ -113,7 +113,7 @@ class MainContent extends Page {
 		browser.waitUntil(function() {
 			browser.waitForVisible('.message:last-child .user-card-message:nth-of-type(2)', 5000);
 			return browser.getText('.message:last-child .user-card-message:nth-of-type(2)') === text;
-		}, 2000);
+		}, 5000);
 	}
 
 	openMessageActionMenu() {