github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

avoid deprecation warnings when running AR tests

Browse Source
This commit is contained in:
Aaron Patterson
2011-12-24 10:43:23 -07:00
parent b590fe4892
commit a410a9c8f7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
activerecord/test/cases/base_test.rb
View File

@@ -1951,7 +1951,9 @@ class BasicsTest < ActiveRecord::TestCase
original_logger = ActiveRecord::Base.logger
log = StringIO.new
ActiveRecord::Base.logger = Logger.new(log)
ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" }
assert_deprecated do
ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" }
end
ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false) { ActiveRecord::Base.logger.debug "Quiet" }
assert_no_match(/Loud/, log.string)
assert_match(/Quiet/, log.string)

5
activerecord/test/cases/helper.rb
View File

@@ -90,7 +90,10 @@ end
unless ENV['FIXTURE_DEBUG']
module ActiveRecord::TestFixtures::ClassMethods
def try_to_load_dependency_with_silence(*args)
ActiveRecord::Base.logger.silence { try_to_load_dependency_without_silence(*args)}
old = ActiveRecord::Base.logger.level
ActiveRecord::Base.logger.level = Logger::ERROR
try_to_load_dependency_without_silence(*args)
ActiveRecord::Base.logger.level = old
end
alias_method_chain :try_to_load_dependency, :silence