taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix auth e2e

stable
Juanfran 2016-01-21 14:41:15 +01:00
parent 339cf5c7bf
commit 9566164031
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
e2e/suites/auth/auth.e2e.js
View File

@ -22,7 +22,11 @@ describe('auth', function() {
$('.submit-button').click(); $('.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() { describe('page without perms', function() {
@ -35,7 +39,9 @@ describe('auth', function() {
it("redirect to login", async function() { it("redirect to login", async function() {
browser.get(browser.params.glob.host + path); 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() { it("login redirect to the previous one", async function() {
@ -43,7 +49,9 @@ describe('auth', function() {
$('input[name="password"]').sendKeys('123123'); $('input[name="password"]').sendKeys('123123');
$('.submit-button').click(); $('.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(); browser.actions().mouseMove($('div[tg-dropdown-user]')).perform();
$$('.dropdown-user li a').last().click(); $$('.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() { describe("register", function() {
@ -105,7 +117,7 @@ describe('auth', function() {
beforeEach(async function() { beforeEach(async function() {
await utils.common.login(user.username, user.password); 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() { it("error", function() {
@ -176,7 +188,9 @@ describe('auth', function() {
$('.lightbox-delete-account .button-green').click(); $('.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');
}); });
}); });
}); });

6
e2e/utils/common.js
View File

@ -141,7 +141,9 @@ common.login = function(username, password) {
let url = await browser.driver.getCurrentUrl(); let url = await browser.driver.getCurrentUrl();
return url === browser.params.glob.host; return url === browser.params.glob.host;
}, 10000); }, 10000).then(function() {
return common.closeJoyride();
});
}; };
common.logout = function() { common.logout = function() {
@ -149,7 +151,7 @@ common.logout = function() {
.mouseMove($('div[tg-dropdown-user]')) .mouseMove($('div[tg-dropdown-user]'))
.perform(); .perform();
common.link($$('.navbar-dropdown li a').last()) common.link($$('.navbar-dropdown li a').last());
return browser.driver.wait(async function() { return browser.driver.wait(async function() {
let url = await browser.driver.getCurrentUrl(); let url = await browser.driver.getCurrentUrl();