jro_apps/redmine Commit - r4090:dd91dc4cb785

Merged r4186 from trunk....

Eric Davis -

r4090:dd91dc4cb785

parent child

Context file:

r4090:dd91dc4cb785

Collapse all files

app/models/issue.rb +3 -3

               end
               def done_ratio
-                if Issue.use_status_for_done_ratio? && status && status.default_done_ratio?
+                if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   status.default_done_ratio
                 else
                   read_attribute(:done_ratio)
               # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
               # even if the user turns off the setting later
               def update_done_ratio_from_issue_status
-                if Issue.use_status_for_done_ratio? && status && status.default_done_ratio?
+                if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
                   self.done_ratio = status.default_done_ratio
                 end
               end
                   end
                   # done ratio = weighted average ratio of leaves
-                  unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio?
+                  unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
                     leaves_count = p.leaves.count
                     if leaves_count > 0
                       average = p.leaves.average(:estimated_hours).to_f

test/fixtures/issues.yml +1 0

               lft: 1
               rgt: 2
               lock_version: 3
+              done_ratio: 30
             issues_003:
               created_on: 2006-07-19 21:07:27 +02:00
               project_id: 1

test/unit/issue_test.rb +15 -3

                   @issue = Issue.find(1)
                   @issue_status = IssueStatus.find(1)
                   @issue_status.update_attribute(:default_done_ratio, 50)
+                  @issue2 = Issue.find(2)
+                  @issue_status2 = IssueStatus.find(2)
+                  @issue_status2.update_attribute(:default_done_ratio, 0)
                 end
                 context "with Setting.issue_done_ratio using the issue_field" do
                   should "read the issue's field" do
                     assert_equal 0, @issue.done_ratio
+                    assert_equal 30, @issue2.done_ratio
                   end
                 end
                   should "read the Issue Status's default done ratio" do
                     assert_equal 50, @issue.done_ratio
+                    assert_equal 0, @issue2.done_ratio
                   end
                 end
               end
                   @issue = Issue.find(1)
                   @issue_status = IssueStatus.find(1)
                   @issue_status.update_attribute(:default_done_ratio, 50)
+                  @issue2 = Issue.find(2)
+                  @issue_status2 = IssueStatus.find(2)
+                  @issue_status2.update_attribute(:default_done_ratio, 0)
                 end
                 context "with Setting.issue_done_ratio using the issue_field" do
                   should "not change the issue" do
                     @issue.update_done_ratio_from_issue_status
+                    @issue2.update_done_ratio_from_issue_status
-                    assert_equal 0, @issue.done_ratio
+                    assert_equal 0, @issue.read_attribute(:done_ratio)
+                    assert_equal 30, @issue2.read_attribute(:done_ratio)
                   end
                 end
                     Setting.issue_done_ratio = 'issue_status'
                   end
-                  should "not change the issue's done ratio" do
+                  should "change the issue's done ratio" do
                     @issue.update_done_ratio_from_issue_status
+                    @issue2.update_done_ratio_from_issue_status
-                    assert_equal 50, @issue.done_ratio
+                    assert_equal 50, @issue.read_attribute(:done_ratio)
+                    assert_equal 0, @issue2.read_attribute(:done_ratio)
                   end
                 end
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages