From d8518c532b57261550e45f2e50d2d9aaa7797943 Mon Sep 17 00:00:00 2001
From: Christian Ratz <c.ratz@finn.de>
Date: Tue, 8 Oct 2013 11:41:52 +0200
Subject: [PATCH] fixed remaining failed cukes

---
 app/assets/javascripts/backlogs/task.js                  | 2 +-
 ...ssue_hierarchy_restriction_project_boundaries.feature | 9 +++++++--
 features/step_definitions/_then_steps.rb                 | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/backlogs/task.js b/app/assets/javascripts/backlogs/task.js
index 9da55cd9cf..02358a45e3 100644
--- a/app/assets/javascripts/backlogs/task.js
+++ b/app/assets/javascripts/backlogs/task.js
@@ -22,7 +22,7 @@ RB.Task = (function ($) {
     },
 
     beforeSave: function name() {
-      if (this.el && this.el.hasClass('dragging')){
+      if (this.el && $(this.el).hasClass('dragging')){
         return;
       }
       var c = this.$.find('select.assigned_to_id').children(':selected').attr('color') || this.defaultColor;
diff --git a/features/issue_hierarchy_restriction_project_boundaries.feature b/features/issue_hierarchy_restriction_project_boundaries.feature
index 975612c5a1..7868dbec9c 100644
--- a/features/issue_hierarchy_restriction_project_boundaries.feature
+++ b/features/issue_hierarchy_restriction_project_boundaries.feature
@@ -31,7 +31,7 @@ Feature: The work_package hierarchy between backlogs stories and backlogs tasks
     And the following types are configured to track stories:
         | Story |
     And the type "Task" is configured to track tasks
-    And the project uses the following types:
+    And the project "parent_project" uses the following types:
         | Story |
         | Epic  |
         | Task  |
@@ -52,8 +52,13 @@ Feature: The work_package hierarchy between backlogs stories and backlogs tasks
         | Lastname | Master |
     And there is 1 project with:
         | name  | child_project  |
-    And the project uses the following modules:
+    And the project "child_project" uses the following modules:
         | backlogs |
+    And the project "child_project" uses the following types:
+        | Story |
+        | Epic  |
+        | Task  |
+        | Bug   |
     And the user "markus" is a "scrum master" in the project "parent_project"
     And the user "markus" is a "scrum master" in the project "child_project"
     And the "cross_project_work_package_relations" setting is set to true
diff --git a/features/step_definitions/_then_steps.rb b/features/step_definitions/_then_steps.rb
index 76adbc252d..061130cd12 100644
--- a/features/step_definitions/_then_steps.rb
+++ b/features/step_definitions/_then_steps.rb
@@ -241,5 +241,5 @@ Then /^there should not be a saving error on task "(.+?)"$/ do |task_name|
 end
 
 Then /^I should be notified that the work_package "(.+?)" is an invalid parent to the work_package "(.+?)" because of cross project limitations$/ do |parent_name, child_name|
-  step %Q{I should see "#{WorkPackage.human_attribute_name(:parent_work_package)} is invalid because the work_package '#{child_name}' is a backlogs task and as such can not have the backlogs story '#{parent_name}' as it´s parent as long as the story is in a different project" within "#errorExplanation"}
+  step %Q{I should see "Parent is invalid because the work_package '#{child_name}' is a backlogs task and as such can not have the backlogs story '#{parent_name}' as it´s parent as long as the story is in a different project" within "#errorExplanation"}
 end