From 0a8ce3b9f213d804811e36c87ffccc36feb4421f Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Tue, 17 May 2011 10:24:28 -0700 Subject: [PATCH] Unscope assoc calls from FakeServiceUser, we can delete this once the last default scope has been removed in the follow merge --- app/models/service_user.rb | 2 +- spec/models/service_user_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/service_user.rb b/app/models/service_user.rb index 369a91382..21e40c62a 100644 --- a/app/models/service_user.rb +++ b/app/models/service_user.rb @@ -45,7 +45,7 @@ class FakeServiceUser < HashWithIndifferentAccess ServiceUser.reflect_on_all_associations.each do |assoc| define_method assoc.name do if associated_id = self[assoc.primary_key_name] - assoc.klass.find(associated_id) + assoc.klass.unscoped.find(associated_id) else nil end diff --git a/spec/models/service_user_spec.rb b/spec/models/service_user_spec.rb index b93e7f855..309ef50d4 100644 --- a/spec/models/service_user_spec.rb +++ b/spec/models/service_user_spec.rb @@ -134,6 +134,7 @@ describe FakeServiceUser do it 'has association methods' do person = mock + Person.stub!(:unscoped).and_return(Person) Person.should_receive(:find).with(@data[5]).and_return person @fake.person.should == person end