diff --git a/app/models/fixed_deliverable.rb b/app/models/fixed_deliverable.rb index 1ec556d..21b2644 100644 --- a/app/models/fixed_deliverable.rb +++ b/app/models/fixed_deliverable.rb @@ -16,10 +16,10 @@ class FixedDeliverable < Deliverable # Get all timelogs assigned time_logs = self.issues.collect(&:time_entries).flatten - + # Find each Member for their rate time_logs.each do |time_log| - rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on) + rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on.to_s) total += (rate * time_log.hours) unless rate.nil? end diff --git a/app/models/hourly_deliverable.rb b/app/models/hourly_deliverable.rb index ee88b8b..3921f36 100644 --- a/app/models/hourly_deliverable.rb +++ b/app/models/hourly_deliverable.rb @@ -9,10 +9,10 @@ class HourlyDeliverable < Deliverable # Get all timelogs assigned time_logs = self.issues.collect(&:time_entries).flatten - + # Find each Member for their rate time_logs.each do |time_log| - rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on) + rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on.to_s) total += (rate * time_log.hours) unless rate.nil? end diff --git a/spec/models/fixed_deliverable_spec.rb b/spec/models/fixed_deliverable_spec.rb index 7d5407b..e9952b8 100644 --- a/spec/models/fixed_deliverable_spec.rb +++ b/spec/models/fixed_deliverable_spec.rb @@ -28,7 +28,7 @@ describe FixedDeliverable, '.spent' do @issue_1_time_entry = mock_model(TimeEntry, :issue_id => @issue1.id, :user => @user, :project => @project, :hours => 1.0, :spent_on => Date.today) @issue1.stub!(:time_entries).and_return([@issue_1_time_entry]) - Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on).and_return(60.0) + Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on.to_s).and_return(60.0) @deliverable = FixedDeliverable.new({ :subject => 'test' }) @issues = [@issue1] diff --git a/spec/models/hourly_deliverable_spec.rb b/spec/models/hourly_deliverable_spec.rb index a04a729..662f764 100644 --- a/spec/models/hourly_deliverable_spec.rb +++ b/spec/models/hourly_deliverable_spec.rb @@ -16,7 +16,7 @@ describe HourlyDeliverable, '.spent' do @issue_1_time_entry = mock_model(TimeEntry, :issue_id => @issue1.id, :user => @user, :project => @project, :hours => 1.0, :spent_on => Date.today) @issue1.stub!(:time_entries).and_return([@issue_1_time_entry]) - Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on).and_return(60.0) + Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on.to_s).and_return(60.0) @deliverable = HourlyDeliverable.new({ :subject => 'test' }) @issues = [@issue1]