Don't store total estimated hours on parent issues (#16092).

Parent can now have its own estimate that is summed up with children estimates.

git-svn-id: http://svn.redmine.org/redmine/trunk@14272 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 42 insertions, 34 deletions

diff --git a/test/unit/issue_nested_set_test.rb b/test/unit/issue_nested_set_test.rb
index 66bb2ba91..0c2631a27 100644
--- a/test/unit/issue_nested_set_test.rb
+++ b/test/unit/issue_nested_set_test.rb
@@ -287,26 +287,6 @@ class IssueNestedSetTest < ActiveSupport::TestCase
     end
   end
 
-  def test_parent_estimate_should_be_sum_of_leaves
-    parent = Issue.generate!
-    parent.generate_child!(:estimated_hours => nil)
-    assert_equal nil, parent.reload.estimated_hours
-    parent.generate_child!(:estimated_hours => 5)
-    assert_equal 5, parent.reload.estimated_hours
-    parent.generate_child!(:estimated_hours => 7)
-    assert_equal 12, parent.reload.estimated_hours
-  end
-
-  def test_move_parent_updates_old_parent_attributes
-    first_parent = Issue.generate!
-    second_parent = Issue.generate!
-    child = first_parent.generate_child!(:estimated_hours => 5)
-    assert_equal 5, first_parent.reload.estimated_hours
-    child.update_attributes(:estimated_hours => 7, :parent_issue_id => second_parent.id)
-    assert_equal 7, second_parent.reload.estimated_hours
-    assert_nil first_parent.reload.estimated_hours
-  end
-
   def test_project_copy_should_copy_issue_tree
     p = Project.create!(:name => 'Tree copy', :identifier => 'tree-copy', :tracker_ids => [1, 2])
     i1 = Issue.generate!(:project => p, :subject => 'i1')
diff --git a/test/unit/issue_subtasking_test.rb b/test/unit/issue_subtasking_test.rb
index d9f9a0824..6f00ee948 100644
--- a/test/unit/issue_subtasking_test.rb
+++ b/test/unit/issue_subtasking_test.rb
@@ -146,23 +146,41 @@ class IssueSubtaskingTest < ActiveSupport::TestCase
   end
 
   def test_done_ratio_of_parent_with_a_child_without_estimated_time_should_not_exceed_100
-    parent = Issue.generate!
-    parent.generate_child!(:estimated_hours => 40)
-    parent.generate_child!(:estimated_hours => 40)
-    parent.generate_child!(:estimated_hours => 20)
-    parent.generate_child!
-    parent.reload.children.each(&:close!)
-    assert_equal 100, parent.reload.done_ratio
+    with_settings :parent_issue_done_ratio => 'derived' do
+      parent = Issue.generate!
+      parent.generate_child!(:estimated_hours => 40)
+      parent.generate_child!(:estimated_hours => 40)
+      parent.generate_child!(:estimated_hours => 20)
+      parent.generate_child!
+      parent.reload.children.each(&:close!)
+      assert_equal 100, parent.reload.done_ratio
+    end
   end
 
   def test_done_ratio_of_parent_with_a_child_with_estimated_time_at_0_should_not_exceed_100
-    parent = Issue.generate!
-    parent.generate_child!(:estimated_hours => 40)
-    parent.generate_child!(:estimated_hours => 40)
-    parent.generate_child!(:estimated_hours => 20)
-    parent.generate_child!(:estimated_hours => 0)
-    parent.reload.children.each(&:close!)
-    assert_equal 100, parent.reload.done_ratio
+    with_settings :parent_issue_done_ratio => 'derived' do
+      parent = Issue.generate!
+      parent.generate_child!(:estimated_hours => 40)
+      parent.generate_child!(:estimated_hours => 40)
+      parent.generate_child!(:estimated_hours => 20)
+      parent.generate_child!(:estimated_hours => 0)
+      parent.reload.children.each(&:close!)
+      assert_equal 100, parent.reload.done_ratio
+    end
+  end
+
+  def test_changing_parent_should_update_previous_parent_done_ratio
+    with_settings :parent_issue_done_ratio => 'derived' do
+      first_parent = Issue.generate!
+      second_parent = Issue.generate!
+      first_parent.generate_child!(:done_ratio => 40)
+      child = first_parent.generate_child!(:done_ratio => 20)
+      assert_equal 30, first_parent.reload.done_ratio
+      assert_equal 0, second_parent.reload.done_ratio
+      child.update_attributes(:parent_issue_id => second_parent.id)
+      assert_equal 40,  first_parent.reload.done_ratio
+      assert_equal 20, second_parent.reload.done_ratio
+    end
   end
 
   def test_parent_dates_should_be_editable_with_parent_issue_dates_set_to_independent
@@ -227,4 +245,14 @@ class IssueSubtaskingTest < ActiveSupport::TestCase
       assert_equal 0, parent.reload.done_ratio
     end
   end
+
+  def test_parent_total_estimated_hours_should_be_sum_of_descendants
+    parent = Issue.generate!
+    parent.generate_child!(:estimated_hours => nil)
+    assert_equal 0, parent.reload.total_estimated_hours
+    parent.generate_child!(:estimated_hours => 5)
+    assert_equal 5, parent.reload.total_estimated_hours
+    parent.generate_child!(:estimated_hours => 7)
+    assert_equal 12, parent.reload.total_estimated_hours
+  end
 end