fixed remaining failed cukes

pull/6827/head
Christian Ratz 11 years ago
parent b4032277db
commit d8518c532b
  1. 2
      app/assets/javascripts/backlogs/task.js
  2. 9
      features/issue_hierarchy_restriction_project_boundaries.feature
  3. 2
      features/step_definitions/_then_steps.rb

@ -22,7 +22,7 @@ RB.Task = (function ($) {
}, },
beforeSave: function name() { beforeSave: function name() {
if (this.el && this.el.hasClass('dragging')){ if (this.el && $(this.el).hasClass('dragging')){
return; return;
} }
var c = this.$.find('select.assigned_to_id').children(':selected').attr('color') || this.defaultColor; var c = this.$.find('select.assigned_to_id').children(':selected').attr('color') || this.defaultColor;

@ -31,7 +31,7 @@ Feature: The work_package hierarchy between backlogs stories and backlogs tasks
And the following types are configured to track stories: And the following types are configured to track stories:
| Story | | Story |
And the type "Task" is configured to track tasks 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 | | Story |
| Epic | | Epic |
| Task | | Task |
@ -52,8 +52,13 @@ Feature: The work_package hierarchy between backlogs stories and backlogs tasks
| Lastname | Master | | Lastname | Master |
And there is 1 project with: And there is 1 project with:
| name | child_project | | name | child_project |
And the project uses the following modules: And the project "child_project" uses the following modules:
| backlogs | | 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 "parent_project"
And the user "markus" is a "scrum master" in the project "child_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 And the "cross_project_work_package_relations" setting is set to true

@ -241,5 +241,5 @@ Then /^there should not be a saving error on task "(.+?)"$/ do |task_name|
end 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| 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 end

Loading…
Cancel
Save