From 4f18c28bba1290fc3952269d46f3bb81a6fa0b52 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 21 Jan 2009 14:31:06 -0800 Subject: [PATCH] Ported FixedDeliverable.spent to use Rate. #1924 --- app/models/fixed_deliverable.rb | 4 ++-- spec/models/fixed_deliverable_spec.rb | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/models/fixed_deliverable.rb b/app/models/fixed_deliverable.rb index 462b414..1ec556d 100644 --- a/app/models/fixed_deliverable.rb +++ b/app/models/fixed_deliverable.rb @@ -19,8 +19,8 @@ class FixedDeliverable < Deliverable # Find each Member for their rate time_logs.each do |time_log| - member = Member.find_by_user_id_and_project_id(time_log.user_id, time_log.project_id) - total += (member.rate * time_log.hours) unless member.nil? || member.rate.nil? + rate = Rate.amount_for(time_log.user, time_log.project, time_log.spent_on) + total += (rate * time_log.hours) unless rate.nil? end return total diff --git a/spec/models/fixed_deliverable_spec.rb b/spec/models/fixed_deliverable_spec.rb index 14ee7ee..7d5407b 100644 --- a/spec/models/fixed_deliverable_spec.rb +++ b/spec/models/fixed_deliverable_spec.rb @@ -25,11 +25,10 @@ describe FixedDeliverable, '.spent' do @user = mock_model(User) @issue1 = mock_model(Issue) - @issue_1_time_entry = mock_model(TimeEntry, :issue_id => @issue1.id, :user_id => @user.id, :project_id => @project.id, :hours => 1.0) + @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]) - @member = mock_model(Member, :user => @user, :project => @project, :rate => 60.0) - Member.should_receive(:find_by_user_id_and_project_id).with(@user.id, @project.id).and_return(@member) + Rate.should_receive(:amount_for).with(@user, @project, @issue_1_time_entry.spent_on).and_return(60.0) @deliverable = FixedDeliverable.new({ :subject => 'test' }) @issues = [@issue1]