Rate#for should handle invalid users. #1920
This commit is contained in:
+1
-4
@@ -26,6 +26,7 @@ class Rate < ActiveRecord::Base
|
||||
|
||||
# API to find the Rate for a +user+ on a +project+ at a +date+
|
||||
def self.for(user, project = nil, date = Date.today.to_s)
|
||||
return nil unless user.is_a?(User)
|
||||
rate = self.for_user_project_and_date(user, project, date)
|
||||
|
||||
return nil if rate.nil?
|
||||
@@ -45,8 +46,4 @@ class Rate < ActiveRecord::Base
|
||||
])
|
||||
|
||||
end
|
||||
|
||||
def self.for_user_and_date(user, date)
|
||||
self.for_user_project_and_date(user, nil, date)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -190,6 +190,12 @@ describe Rate, 'for' do
|
||||
Rate.for(@user).should eql(@rate.amount)
|
||||
end
|
||||
end
|
||||
|
||||
it 'with an invalid user should be nil' do
|
||||
object = mock('random_object_with_id_attribute')
|
||||
Rate.should_not_receive(:for_user_project_and_date)
|
||||
Rate.for(object).should be_nil
|
||||
end
|
||||
end
|
||||
|
||||
describe Rate, 'for_user_project_and_date (private)' do
|
||||
|
||||
Reference in New Issue
Block a user