diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 12:16:07 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-04-04 12:16:07 -0700 |
| commit | 56d9945e8a9613c2983c3ab60600bac6e58b58d8 (patch) | |
| tree | 770baed5017e0303027a2d7fc64062e51c28181a | |
| parent | 6663dd0969595786d2d2d94f05fc93642d103e18 (diff) | |
| parent | 1124ac00c9ac2f6dfc3d8fb28130e39bcaa42850 (diff) | |
| download | rails-56d9945e8a9613c2983c3ab60600bac6e58b58d8.tar.gz rails-56d9945e8a9613c2983c3ab60600bac6e58b58d8.tar.bz2 rails-56d9945e8a9613c2983c3ab60600bac6e58b58d8.zip | |
Merge pull request #5737 from rafaelfranca/3-2-stable
Fix tests of benchmark with silence equals to true
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 300a3636e3..f6497d9bad 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -1992,9 +1992,7 @@ class BasicsTest < ActiveRecord::TestCase original_logger = ActiveRecord::Base.logger log = StringIO.new ActiveRecord::Base.logger = Logger.new(log) - assert_deprecated do - ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" } - end + ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => true) { ActiveRecord::Base.logger.debug "Loud" } ActiveRecord::Base.benchmark("Logging", :level => :debug, :silence => false) { ActiveRecord::Base.logger.debug "Quiet" } assert_no_match(/Loud/, log.string) assert_match(/Quiet/, log.string) |