From f64ce4f3d243df9289d7fa46c27dc30f6503b0ab Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 30 Oct 2015 09:12:27 +0100 Subject: [PATCH] Refactoring common.link and adding home navigation option --- e2e/utils/common.js | 20 +++++++++++++++++++- e2e/utils/nav.js | 8 ++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/e2e/utils/common.js b/e2e/utils/common.js index 46432e5a..182ec03e 100644 --- a/e2e/utils/common.js +++ b/e2e/utils/common.js @@ -49,11 +49,29 @@ common.browserSkip = function(browserName, name, fn) { }; common.link = async function(el) { - return browser + let oldUrl = await browser.getCurrentUrl(); + + browser + .actions() + .mouseMove(el) + .perform(); + + await browser.wait(async function() { + let href = await el.getAttribute('href'); + return href.length > 1 && href !== browser.params.glob.host + "#"; + }, 5000); + + browser .actions() .mouseMove(el) .click() .perform(); + + return browser.wait(async function() { + let newUrl = await browser.getCurrentUrl(); + + return oldUrl !== newUrl; + }, 5000); }; common.waitLoader = function () { diff --git a/e2e/utils/nav.js b/e2e/utils/nav.js index 20bd694c..65527210 100644 --- a/e2e/utils/nav.js +++ b/e2e/utils/nav.js @@ -42,6 +42,10 @@ var actions = { return common.waitLoader(); }, + home: function() { + browser.get(browser.params.glob.host); + return common.waitLoader(); + }, taskboard: function(index) { let link = $$('.sprints .button-gray').get(index); @@ -77,6 +81,10 @@ var nav = { this.actions.push(actions.us.bind(null, index)); return this; }, + home: function() { + this.actions.push(actions.home.bind(null)); + return this; + }, taskboard: function(index) { this.actions.push(actions.taskboard.bind(null, index)); return this;