aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/capture_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-12-26 05:20:15 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2011-12-26 05:20:15 -0800
commiteeb7736860cc743a723cff2db739785a22e22735 (patch)
treed53f815cc8c6fc6d7c685b918cdd3b63e8518fa9 /actionpack/test/controller/capture_test.rb
parent719ba0b6bb0653da3f35ed55557d7c3f034c092a (diff)
parent131c9ba9d00f49e3b52bf606ca60317c28b4ce6a (diff)
downloadrails-eeb7736860cc743a723cff2db739785a22e22735.tar.gz
rails-eeb7736860cc743a723cff2db739785a22e22735.tar.bz2
rails-eeb7736860cc743a723cff2db739785a22e22735.zip
Merge pull request #4150 from Karunakar/new_PR
change Log
Diffstat (limited to 'actionpack/test/controller/capture_test.rb')
-rw-r--r--actionpack/test/controller/capture_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index d78acb8ce8..a217510434 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -1,5 +1,5 @@
require 'abstract_unit'
-require 'logger'
+require 'active_support/logger'
class CaptureController < ActionController::Base
def self.controller_name; "test"; end
@@ -39,7 +39,7 @@ class CaptureTest < 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