From 9566164031eb29902fc6427919c23f1a66c8d202 Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 21 Jan 2016 14:41:15 +0100
Subject: [PATCH] fix auth e2e

---
 e2e/suites/auth/auth.e2e.js | 26 ++++++++++++++++++++------
 e2e/utils/common.js         |  6 ++++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/e2e/suites/auth/auth.e2e.js b/e2e/suites/auth/auth.e2e.js
index f7b7b502..52f15d91 100644
--- a/e2e/suites/auth/auth.e2e.js
+++ b/e2e/suites/auth/auth.e2e.js
@@ -22,7 +22,11 @@ describe('auth', function() {
 
         $('.submit-button').click();
 
-        expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host);
+        await utils.common.waitLoader();
+
+        let url = await browser.getCurrentUrl();
+
+        expect(url).to.be.equal(browser.params.glob.host);
     });
 
     describe('page without perms', function() {
@@ -35,7 +39,9 @@ describe('auth', function() {
         it("redirect to login", async function() {
             browser.get(browser.params.glob.host + path);
 
-            expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + 'login?next=' + encodeURIComponent('/' + path));
+            let url = await browser.getCurrentUrl();
+
+            expect(url).to.be.equal(browser.params.glob.host + 'login?next=' + encodeURIComponent('/' + path));
         });
 
         it("login redirect to the previous one", async function() {
@@ -43,7 +49,9 @@ describe('auth', function() {
             $('input[name="password"]').sendKeys('123123');
             $('.submit-button').click();
 
-            expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + path);
+            let url = await browser.getCurrentUrl();
+
+            expect(url).to.be.equal(browser.params.glob.host + path);
         });
     });
 
@@ -60,7 +68,11 @@ describe('auth', function() {
             browser.actions().mouseMove($('div[tg-dropdown-user]')).perform();
             $$('.dropdown-user li a').last().click();
 
-            expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + 'login');
+            await utils.common.waitLoader();
+
+            let url = await browser.getCurrentUrl();
+
+            expect(url).to.be.equal(browser.params.glob.host + 'login');
         });
 
         describe("register", function() {
@@ -105,7 +117,7 @@ describe('auth', function() {
             beforeEach(async function() {
                 await utils.common.login(user.username, user.password);
 
-                browser.get(browser.params.glob.host + 'user-settings/user-change-password');
+                return browser.get(browser.params.glob.host + 'user-settings/user-change-password');
             });
 
             it("error", function() {
@@ -176,7 +188,9 @@ describe('auth', function() {
 
                 $('.lightbox-delete-account .button-green').click();
 
-                expect(browser.getCurrentUrl()).to.be.eventually.equal(browser.params.glob.host + 'login');
+                let url = await browser.getCurrentUrl();
+
+                expect(url).to.be.equal(browser.params.glob.host + 'login');
             });
         });
     });
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index 64009d45..a0f9511d 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -141,7 +141,9 @@ common.login = function(username, password) {
         let url =  await browser.driver.getCurrentUrl();
 
         return url === browser.params.glob.host;
-    }, 10000);
+    }, 10000).then(function() {
+        return common.closeJoyride();
+    });
 };
 
 common.logout = function() {
@@ -149,7 +151,7 @@ common.logout = function() {
         .mouseMove($('div[tg-dropdown-user]'))
         .perform();
 
-    common.link($$('.navbar-dropdown li a').last())
+    common.link($$('.navbar-dropdown li a').last());
 
     return browser.driver.wait(async function() {
         let url =  await browser.driver.getCurrentUrl();