4 files changed, 8 insertions, 24 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
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 6cc63851e9..1c22a79d75 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -491,6 +491,11 @@ class TimeExtCalculationsTest < ActiveSupport::TestCase
     assert_equal Time.utc(2013,10,17,20,22,19), Time.utc(2005,2,28,15,15,10).advance(:years => 7, :months => 19, :weeks => 2, :days => 5, :hours => 5, :minutes => 7, :seconds => 9)
   end
 
+  def test_advance_with_nsec
+    t = Time.at(0, Rational(108635108, 1000))
+    assert_equal t, t.advance(:months => 0)
+  end
+
   def test_prev_week
     with_env_tz 'US/Eastern' do
       assert_equal Time.local(2005,2,21), Time.local(2005,3,1,15,15,10).prev_week
diff --git a/activesupport/test/isolation_test.rb b/activesupport/test/isolation_test.rb
index 2c2986ea28..c1932d73d9 100644
--- a/activesupport/test/isolation_test.rb
+++ b/activesupport/test/isolation_test.rb
@@ -80,26 +80,6 @@ else
     ENV.delete("CHILD")
 
     def setup
-      defined?(::MiniTest) ? parse_minitest : parse_testunit
-    end
-
-    def parse_testunit
-      @results = {}
-      OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].to_s.split(/\s*\n\s*/).each do |result|
-        result =~ %r'^(\w+)\(\w+\):\s*(\.|E|F)$'
-        @results[$1] = { 'E' => :error, '.' => :success, 'F' => :failure }[$2]
-      end
-
-      # Extract the backtraces
-      @backtraces = {}
-      OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
-        # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
-        backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
-        @backtraces[$2] = { :type => $1, :output => backtrace }
-      end
-    end
-
-    def parse_minitest
       @results = {}
       OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].to_s.split(/\s*\n\s*/).each do |result|
         result =~ %r'^\w+#(\w+):.*:\s*(.*Assertion.*|.*RuntimeError.*|\.\s*)$'
@@ -115,7 +95,7 @@ else
       OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
         # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
         backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
-        @backtraces[$2] = { :type => $1, :output => backtrace }
+        @backtraces[$2] = {:type => $1, :output => backtrace}
       end
     end