Fix sweeper when #current_user method is private

jwachira · Sep 29, 2009 · cb4fc7a · cb4fc7a
1 parent 8560f0e
commit cb4fc7a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/acts_as_audited/audit_sweeper.rb b/lib/acts_as_audited/audit_sweeper.rb
@@ -73,7 +73,7 @@ def before_update(record)
   end
 
   def current_user
-    controller.send :current_user if controller.respond_to?(:current_user)
+    controller.send :current_user if controller.respond_to?(:current_user, true)
   end
 
 end
diff --git a/test/audit_sweeper_test.rb b/test/audit_sweeper_test.rb
@@ -2,13 +2,14 @@
 
 class AuditsController < ActionController::Base
   audit Company
-  attr_accessor :current_user
 
   def audit
     @company = Company.create
     render :nothing => true
   end
 
+private
+  attr_accessor :current_user
 end
 AuditsController.view_paths = [File.dirname(__FILE__)]
 ActionController::Routing::Routes.draw {|m| m.connect ':controller/:action/:id' }
@@ -20,7 +21,7 @@ class AuditsControllerTest < ActionController::TestCase
   end
 
   should "audit user" do
-    user = @controller.current_user = create_user
+    user = @controller.send(:current_user=, create_user)
     lambda { post :audit }.should change { Audit.count }
     assigns(:company).audits.last.user.should == user
   end