From 2ea54668a0685db4d61ce0ba03a090360ea4e3ff Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 19 Sep 2017 21:58:16 -0300
Subject: [PATCH] Fix tests

---
 packages/rocketchat-lib/client/lib/settings.js      | 2 +-
 packages/rocketchat-ui-message/client/message.js    | 4 +++-
 packages/rocketchat-ui-message/client/messageBox.js | 4 ++--
 packages/rocketchat-ui/client/views/app/room.js     | 9 +++++----
 tests/end-to-end/ui/11-admin.js                     | 2 ++
 tests/pageobjects/administration.page.js            | 1 +
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/rocketchat-lib/client/lib/settings.js b/packages/rocketchat-lib/client/lib/settings.js
index 70ada7d6f27..03896cd1151 100644
--- a/packages/rocketchat-lib/client/lib/settings.js
+++ b/packages/rocketchat-lib/client/lib/settings.js
@@ -60,7 +60,7 @@ Meteor.startup(function() {
 		}
 		Meteor.setTimeout(function() {
 			const currentUrl = location.origin + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
-			if (__meteor_runtime_config__.ROOT_URL !== currentUrl) {
+			if (__meteor_runtime_config__.ROOT_URL.replace(/\/$/, '') !== currentUrl) {
 				swal({
 					type: 'warning',
 					title: t('Warning'),
diff --git a/packages/rocketchat-ui-message/client/message.js b/packages/rocketchat-ui-message/client/message.js
index cd142696d30..ad64a746b16 100644
--- a/packages/rocketchat-ui-message/client/message.js
+++ b/packages/rocketchat-ui-message/client/message.js
@@ -367,9 +367,11 @@ Template.message.onViewRendered = function(context) {
 			if (!templateInstance) {
 				return;
 			}
+
 			if (currentNode.classList.contains('own') === true) {
-				return (templateInstance.atBottom = true);
+				templateInstance.atBottom = true;
 			}
+			templateInstance.sendToBottomIfNecessary();
 		}
 	});
 };
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 6393ce98a0e..7087813ab9c 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -364,9 +364,9 @@ Template.messageBox.events({
 			// fixes https://github.com/RocketChat/Rocket.Chat/issues/3037
 			// at this point, the input is cleared and ready for autogrow
 			input.updateAutogrow();
-			return instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			instance.isMessageFieldEmpty.set(chatMessages[this._id].isEmpty());
+			return input.focus();
 		});
-		return input.focus();
 	},
 	'keyup .js-input-message'(event, instance) {
 		chatMessages[this._id].keyup(this._id, event, instance);
diff --git a/packages/rocketchat-ui/client/views/app/room.js b/packages/rocketchat-ui/client/views/app/room.js
index 5a57d3821da..37d029387e8 100644
--- a/packages/rocketchat-ui/client/views/app/room.js
+++ b/packages/rocketchat-ui/client/views/app/room.js
@@ -817,8 +817,10 @@ Template.room.onRendered(function() {
 	const messageBox = $('.messages-box');
 
 	template.isAtBottom = function(scrollThreshold) {
-		if ((scrollThreshold == null)) { scrollThreshold = 0; }
-		if ((wrapper.scrollTop + scrollThreshold) >= (wrapper.scrollHeight - wrapper.clientHeight)) {
+		if (scrollThreshold == null) {
+			scrollThreshold = 0;
+		}
+		if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
 			newMessage.className = 'new-message background-primary-action-color color-content-background-color not';
 			return true;
 		}
@@ -837,8 +839,7 @@ Template.room.onRendered(function() {
 	};
 
 	template.sendToBottomIfNecessary = function() {
-
-		if ((template.atBottom === true) && (template.isAtBottom() !== true)) {
+		if (template.atBottom === true && template.isAtBottom() !== true) {
 			return template.sendToBottom();
 		}
 	};
diff --git a/tests/end-to-end/ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
index 2f190a0219b..7ddd185c62a 100644
--- a/tests/end-to-end/ui/11-admin.js
+++ b/tests/end-to-end/ui/11-admin.js
@@ -414,8 +414,10 @@ describe('[Administration]', () => {
 
 		describe('[General Settings]', () => {
 			before(() => {
+				admin.settingsSearch.setValue('general');
 				admin.generalLink.waitForVisible(5000);
 				admin.generalLink.click();
+				admin.settingsSearch.setValue('');
 				admin.generalSiteUrl.waitForVisible(5000);
 			});
 
diff --git a/tests/pageobjects/administration.page.js b/tests/pageobjects/administration.page.js
index 526d1eedd00..eeaeb620416 100644
--- a/tests/pageobjects/administration.page.js
+++ b/tests/pageobjects/administration.page.js
@@ -3,6 +3,7 @@ import Page from './Page';
 class Administration extends Page {
 	get flexNav() { return browser.element('.flex-nav'); }
 	get flexNavContent() { return browser.element('.flex-nav'); }
+	get settingsSearch() { return browser.element('[name=settings-search]'); }
 	get layoutLink() { return browser.element('.flex-nav [href="/admin/Layout"]'); }
 	get infoLink() { return browser.element('.flex-nav [href="/admin/info"]'); }
 	get roomsLink() { return browser.element('.flex-nav [href="/admin/rooms"]'); }