From d233ea2ef2ceef1334f7c57b79483ff0f8a04787 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Mon, 27 Feb 2017 10:47:00 +0100
Subject: [PATCH] Fixing user stories e2e tests

---
 app/coffee/modules/related-tasks.coffee | 11 +++++++++--
 e2e/helpers/us-detail-helper.js         |  8 +++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/coffee/modules/related-tasks.coffee b/app/coffee/modules/related-tasks.coffee
index 1c180850..9d42ae32 100644
--- a/app/coffee/modules/related-tasks.coffee
+++ b/app/coffee/modules/related-tasks.coffee
@@ -34,6 +34,8 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
     templateEdit = $template.get("task/related-task-row-edit.html", true)
 
     link = ($scope, $el, $attrs, $model) ->
+        @childScope = $scope.$new()
+
         saveTask = debounce 2000, (task) ->
             task.subject = $el.find('input').val()
 
@@ -53,7 +55,10 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
             return promise
 
         renderEdit = (task) ->
-            $el.html($compile(templateEdit({task: task}))($scope))
+            @childScope.$destroy()
+            @childScope = $scope.$new()
+            $el.off()
+            $el.html($compile(templateEdit({task: task}))(childScope))
 
             $el.find(".task-name input").val(task.subject)
 
@@ -72,6 +77,8 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
                 renderView($model.$modelValue)
 
         renderView = (task) ->
+            @childScope.$destroy()
+            @childScope = $scope.$new()
             $el.off()
 
             perms = {
@@ -79,7 +86,7 @@ RelatedTaskRowDirective = ($repo, $compile, $confirm, $rootscope, $loading, $tem
                 delete_task: $scope.project.my_permissions.indexOf("delete_task") != -1
             }
 
-            $el.html($compile(templateView({task: task, perms: perms}))($scope))
+            $el.html($compile(templateView({task: task, perms: perms}))(childScope))
 
             $el.on "click", ".edit-task", ->
                 renderEdit($model.$modelValue)
diff --git a/e2e/helpers/us-detail-helper.js b/e2e/helpers/us-detail-helper.js
index b419d433..7509831e 100644
--- a/e2e/helpers/us-detail-helper.js
+++ b/e2e/helpers/us-detail-helper.js
@@ -32,15 +32,17 @@ helper.createRelatedTasks = function(name, status, assigned_to) {
 
     let form = $('.related-task-create-form');
 
-    return helper.relatedTaskForm(form, status, assigned_to);
+    return helper.relatedTaskForm(form, name, status, assigned_to);
 };
 
-helper.editRelatedTasks = function(taskIndex, name, status, assigned_to) {
+helper.editRelatedTasks = async function(taskIndex, name, status, assigned_to) {
     let task = helper.relatedTasks().get(taskIndex);
 
     task.$('.edit-task').click();
 
-    return helper.relatedTaskForm(task, status, assigned_to);
+    helper.relatedTaskForm(task, name, status, assigned_to);
+
+    await browser.sleep(30000);
 };
 
 helper.editRelatedTasksEnabled = function() {