diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-15 05:57:08 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-15 05:57:08 -0700 |
commit | 1b7894c95b1bdd2a3dca204629b66060f8a16bca (patch) | |
tree | c28bf38cd68c5e74c867ed160f157db3ad898ebf /activerecord/test/cases | |
parent | 3ec6783613e062da231d9a0d335cbf61bfad4bb4 (diff) | |
parent | ed2fea908a9f8540ac2ea949e3e258ab88769cb1 (diff) | |
download | rails-1b7894c95b1bdd2a3dca204629b66060f8a16bca.tar.gz rails-1b7894c95b1bdd2a3dca204629b66060f8a16bca.tar.bz2 rails-1b7894c95b1bdd2a3dca204629b66060f8a16bca.zip |
Merge pull request #7643 from steveklabnik/deprecate_silence
Deprecate ActiveSupport::Benchmarkable#silence.
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/base_test.rb | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index b9d480d9ce..b25d169038 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1619,26 +1619,32 @@ class BasicsTest < ActiveRecord::TestCase def test_silence_sets_log_level_to_error_in_block original_logger = ActiveRecord::Base.logger - log = StringIO.new - ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) - ActiveRecord::Base.logger.level = Logger::DEBUG - ActiveRecord::Base.silence do - ActiveRecord::Base.logger.warn "warn" - ActiveRecord::Base.logger.error "error" + + assert_deprecated do + log = StringIO.new + ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) + ActiveRecord::Base.logger.level = Logger::DEBUG + ActiveRecord::Base.silence do + ActiveRecord::Base.logger.warn "warn" + ActiveRecord::Base.logger.error "error" + end + assert_equal "error\n", log.string end - assert_equal "error\n", log.string ensure ActiveRecord::Base.logger = original_logger end def test_silence_sets_log_level_back_to_level_before_yield original_logger = ActiveRecord::Base.logger - log = StringIO.new - ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) - ActiveRecord::Base.logger.level = Logger::WARN - ActiveRecord::Base.silence do + + assert_deprecated do + log = StringIO.new + ActiveRecord::Base.logger = ActiveSupport::Logger.new(log) + ActiveRecord::Base.logger.level = Logger::WARN + ActiveRecord::Base.silence do + end + assert_equal Logger::WARN, ActiveRecord::Base.logger.level end - assert_equal Logger::WARN, ActiveRecord::Base.logger.level ensure ActiveRecord::Base.logger = original_logger end |