Progress and Score should be 0 by default. #1305
This commit is contained in:
@@ -48,11 +48,11 @@ class Deliverable < ActiveRecord::Base
|
||||
# assigned issues. Currently requires the +default_done_ratio+ patch.
|
||||
def progress
|
||||
# TODO LATER: Shouldn't require the default_done_ratio patch
|
||||
return 100 unless self.issues.size > 0
|
||||
return 0 unless self.issues.size > 0
|
||||
|
||||
total ||= self.issues.collect(&:estimated_hours).delete_if {|e| e.nil? }.inject {|sum, n| sum + n} || 0
|
||||
|
||||
return 100 unless total > 0
|
||||
return 0 unless total > 0
|
||||
balance = 0.0
|
||||
|
||||
self.issues.each do |issue|
|
||||
|
||||
@@ -165,11 +165,11 @@ describe Deliverable, '.progress' do
|
||||
@deliverable.progress.should eql(66)
|
||||
end
|
||||
|
||||
it 'should return 100 if there are no assigned issues' do
|
||||
it 'should return 0 if there are no assigned issues' do
|
||||
@deliverable = Deliverable.new({ :subject => 'test' })
|
||||
@deliverable.should_receive(:issues).and_return([])
|
||||
|
||||
@deliverable.progress.should eql(100)
|
||||
@deliverable.progress.should eql(0)
|
||||
end
|
||||
|
||||
it 'should not count issues with no estimated time' do
|
||||
@@ -187,7 +187,7 @@ describe Deliverable, '.progress' do
|
||||
@deliverable.progress.should eql(50)
|
||||
end
|
||||
|
||||
it 'should return 100 if there are no estimates on any of the assigned issues' do
|
||||
it 'should return 0 if there are no estimates on any of the assigned issues' do
|
||||
@issue1 = mock_model(Issue)
|
||||
@issue1.should_receive(:estimated_hours).and_return(nil)
|
||||
@issue2 = mock_model(Issue)
|
||||
@@ -198,7 +198,7 @@ describe Deliverable, '.progress' do
|
||||
@deliverable = Deliverable.new({ :subject => 'test' })
|
||||
@deliverable.should_receive(:issues).exactly(2).times.and_return(@issues)
|
||||
|
||||
@deliverable.progress.should eql(100)
|
||||
@deliverable.progress.should eql(0)
|
||||
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user