aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-07-19 13:19:28 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-07-19 13:19:28 -0700
commit1b26c66ce470ce68674bbdce738c6f68467cff7d (patch)
tree0ec78c0fffc0d2ad21d05f2862f43046fc444630
parent38f0161aabb302550e1522cb62d19e54d448be9b (diff)
downloadrails-1b26c66ce470ce68674bbdce738c6f68467cff7d.tar.gz
rails-1b26c66ce470ce68674bbdce738c6f68467cff7d.tar.bz2
rails-1b26c66ce470ce68674bbdce738c6f68467cff7d.zip
mocking out debing? call in the MockLogger
-rw-r--r--activerecord/test/cases/log_subscriber_test.rb2
-rw-r--r--activesupport/lib/active_support/log_subscriber/test_helper.rb3
2 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb
index cde383783b..fa53fc7477 100644
--- a/activerecord/test/cases/log_subscriber_test.rb
+++ b/activerecord/test/cases/log_subscriber_test.rb
@@ -22,6 +22,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
end
def test_basic_query_logging
+ @logger.debugging = true
Developer.all
wait
assert_equal 1, @logger.logged(:debug).size
@@ -30,6 +31,7 @@ class LogSubscriberTest < ActiveRecord::TestCase
end
def test_cached_queries
+ @logger.debugging = true
ActiveRecord::Base.cache do
Developer.all
Developer.all
diff --git a/activesupport/lib/active_support/log_subscriber/test_helper.rb b/activesupport/lib/active_support/log_subscriber/test_helper.rb
index a3fb92778b..0f5fc3554b 100644
--- a/activesupport/lib/active_support/log_subscriber/test_helper.rb
+++ b/activesupport/lib/active_support/log_subscriber/test_helper.rb
@@ -48,9 +48,12 @@ module ActiveSupport
class MockLogger
attr_reader :flush_count
+ attr_accessor :debugging
+ alias :debug? :debugging
def initialize
@flush_count = 0
+ @debugging = false
@logged = Hash.new { |h,k| h[k] = [] }
end