From 68fd13d379e8dcd8db0207b6385108e5790f8c7a Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Tue, 6 Oct 2015 10:19:51 +0200
Subject: [PATCH] fix custom filters creation path e2e

---
 e2e/full/issues/issue-detail.e2e.js            | 2 +-
 e2e/full/user-stories/user-story-detail.e2e.js | 2 +-
 e2e/helpers/us-detail-helper.js                | 2 +-
 e2e/utils/common.js                            | 6 ++++++
 e2e/utils/detail.js                            | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/e2e/full/issues/issue-detail.e2e.js b/e2e/full/issues/issue-detail.e2e.js
index d6c00623..e198b2be 100644
--- a/e2e/full/issues/issue-detail.e2e.js
+++ b/e2e/full/issues/issue-detail.e2e.js
@@ -12,7 +12,7 @@ describe('Issue detail', async function(){
     before(async function(){
         utils.nav
             .init()
-            .project(0)
+            .project(1)
             .issues()
             .issue(0)
             .go();
diff --git a/e2e/full/user-stories/user-story-detail.e2e.js b/e2e/full/user-stories/user-story-detail.e2e.js
index c5c9eb70..c8dedbb6 100644
--- a/e2e/full/user-stories/user-story-detail.e2e.js
+++ b/e2e/full/user-stories/user-story-detail.e2e.js
@@ -13,7 +13,7 @@ describe('User story detail', function(){
     before(async function(){
         utils.nav
             .init()
-            .project(0)
+            .project(1)
             .backlog()
             .us(0)
             .go();
diff --git a/e2e/helpers/us-detail-helper.js b/e2e/helpers/us-detail-helper.js
index e968241e..3a6bf3c4 100644
--- a/e2e/helpers/us-detail-helper.js
+++ b/e2e/helpers/us-detail-helper.js
@@ -50,7 +50,7 @@ helper.relatedTaskForm = function(form, name, status, assigned_to) {
 
     utils.popover.open(taskStatus, status);
 
-    form.$('.assigned-to').click();
+    form.$('.task-assignedto').click();
 
     let assignToLightbox = commonHelper.assignToLightbox();
 
diff --git a/e2e/utils/common.js b/e2e/utils/common.js
index aaf74228..fe3a1cb2 100644
--- a/e2e/utils/common.js
+++ b/e2e/utils/common.js
@@ -331,6 +331,12 @@ common.topMenuOption = async function(option) {
     return menu.$$('li a').get(option).click();
 };
 
+common.getProjectUrlRoot = async function() {
+    let url =  await browser.driver.getCurrentUrl();
+
+    return browser.params.glob.host + url.split('/').slice(3, 5).join('/');
+};
+
 common.goToBacklog = async function() {
     await common.link($('#nav-backlog a'));
 
diff --git a/e2e/utils/detail.js b/e2e/utils/detail.js
index 9aa1ccc9..9f914e5f 100644
--- a/e2e/utils/detail.js
+++ b/e2e/utils/detail.js
@@ -218,7 +218,9 @@ helper.customFields = function(typeIndex) {
     before(async function() {
         let url = await browser.getCurrentUrl();
 
-        browser.get(browser.params.glob.host + 'project/project-3/admin/project-values/custom-fields');
+        let rootUrl = await commonUtil.getProjectUrlRoot();
+
+        browser.get(rootUrl + '/admin/project-values/custom-fields');
 
         commonUtil.waitLoader();