1 files changed, 8 insertions, 1 deletions
diff --git a/webclient/test/protractor.conf.js b/webclient/test/protractor.conf.js
index 720096b390..76ae7b712b 100644
--- a/webclient/test/protractor.conf.js
+++ b/webclient/test/protractor.conf.js
@@ -3,9 +3,16 @@ exports.config = {
     seleniumAddress: env.seleniumAddress,
     specs: ['e2e/*.spec.js'],
     onPrepare: function() {
-        browser.driver.get(env.loginUrl);
+        browser.driver.get(env.baseUrl);
         browser.driver.findElement(by.id("user_id")).sendKeys(env.username);
         browser.driver.findElement(by.id("password")).sendKeys(env.password);
         browser.driver.findElement(by.id("login")).click();
+
+        // wait till the login is done, detect via url change
+        browser.driver.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+                return !(/login/.test(url))
+            });
+        });
     }
 }