aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-01-05 12:03:10 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-01-05 12:03:10 -0800
commit013d959917a3f682f921dc6af726fa2136285bed (patch)
treed1efcdbf5bfa347a5fbb436d4db61f962382d8a2 /activesupport
parent4d08324aac7a50bbaa8f6200f50e8a7f6ff3ce48 (diff)
parent00236435221a39441af3f1e76110767fba4154a8 (diff)
downloadrails-013d959917a3f682f921dc6af726fa2136285bed.tar.gz
rails-013d959917a3f682f921dc6af726fa2136285bed.tar.bz2
rails-013d959917a3f682f921dc6af726fa2136285bed.zip
Merge pull request #4303 from Karunakar/logger
Moved the logger methods in activeresource/test/abstract_unit.rb
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/buffered_logger_test.rb1
-rw-r--r--activesupport/test/caching_test.rb4
2 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index b9891c74c8..4ed425732a 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -3,7 +3,6 @@ require 'multibyte_test_helpers'
require 'stringio'
require 'fileutils'
require 'tempfile'
-require 'active_support/buffered_logger'
require 'active_support/testing/deprecation'
class BufferedLoggerTest < Test::Unit::TestCase
diff --git a/activesupport/test/caching_test.rb b/activesupport/test/caching_test.rb
index aa6fb14e7b..3454c378d3 100644
--- a/activesupport/test/caching_test.rb
+++ b/activesupport/test/caching_test.rb
@@ -681,7 +681,7 @@ uses_memcached 'memcached backed store' do
@data = @cache.instance_variable_get(:@data)
@cache.clear
@cache.silence!
- @cache.logger = Logger.new("/dev/null")
+ @cache.logger = ActiveSupport::Logger.new("/dev/null")
end
include CacheStoreBehavior
@@ -786,7 +786,7 @@ class CacheStoreLoggerTest < ActiveSupport::TestCase
@cache = ActiveSupport::Cache.lookup_store(:memory_store)
@buffer = StringIO.new
- @cache.logger = Logger.new(@buffer)
+ @cache.logger = ActiveSupport::Logger.new(@buffer)
end
def test_logging