aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-21 06:36:14 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-21 06:36:14 -0800
commit987ca2ae24226ccfddbcf87e7e1750c7f9cfcaa1 (patch)
treec4bf702dd1d7be7aeabd20fca927b6c1751d4976
parente56043e5f8fdc8422cc3455393a55fd08fd60ccf (diff)
parented1b4ea3f9bf1d3114fa40673be124bf5f6f80c8 (diff)
downloadrails-987ca2ae24226ccfddbcf87e7e1750c7f9cfcaa1.tar.gz
rails-987ca2ae24226ccfddbcf87e7e1750c7f9cfcaa1.tar.bz2
rails-987ca2ae24226ccfddbcf87e7e1750c7f9cfcaa1.zip
Merge pull request #4098 from Karunakar/active_model2
removed deprecated loggers
-rw-r--r--activemodel/test/cases/mass_assignment_security/sanitizer_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb b/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
index 676937b5e1..3660b9b1e5 100644
--- a/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
+++ b/activemodel/test/cases/mass_assignment_security/sanitizer_test.rb
@@ -1,5 +1,5 @@
require "cases/helper"
-require 'logger'
+require 'active_support/logger'
require 'active_support/core_ext/object/inclusion'
class SanitizerTest < ActiveModel::TestCase
@@ -28,7 +28,7 @@ class SanitizerTest < ActiveModel::TestCase
test "debug mass assignment removal with LoggerSanitizer" do
original_attributes = { 'first_name' => 'allowed', 'admin' => 'denied' }
log = StringIO.new
- self.logger = Logger.new(log)
+ self.logger = ActiveSupport::Logger.new(log)
@logger_sanitizer.sanitize(original_attributes, @authorizer)
assert_match(/admin/, log.string, "Should log removed attributes: #{log.string}")
end