1 files changed, 12 insertions, 10 deletions
diff --git a/actionpack/test/controller/addresses_render_test.rb b/actionpack/test/controller/addresses_render_test.rb
index c1cd22113d..07f27fd362 100644
--- a/actionpack/test/controller/addresses_render_test.rb
+++ b/actionpack/test/controller/addresses_render_test.rb
@@ -1,18 +1,20 @@
 require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
 require 'controller/fake_controllers'
 
 class Address
-  def Address.count(conditions = nil, join = nil)
-    nil
-  end
+  class << self
+    def count(conditions = nil, join = nil)
+      nil
+    end
 
-  def Address.find_all(arg1, arg2, arg3, arg4)
-    []
-  end
+    def find_all(arg1, arg2, arg3, arg4)
+      []
+    end
 
-  def self.find(*args)
-    []
+    def find(*args)
+      []
+    end
   end
 end
 
@@ -23,7 +25,7 @@ class AddressesTest < ActionController::TestCase
     super
     # enable a logger so that (e.g.) the benchmarking stuff runs, so we can get
     # a more accurate simulation of what happens in "real life".
-    @controller.logger = Logger.new(nil)
+    @controller.logger = ActiveSupport::Logger.new(nil)
 
     @request.host = "www.nextangle.com"
   end