4 files changed, 54 insertions, 6 deletions
diff --git a/activesupport/test/core_ext/duplicable_test.rb b/activesupport/test/core_ext/duplicable_test.rb
index 6e1f876959..24e0ccd9b3 100644
--- a/activesupport/test/core_ext/duplicable_test.rb
+++ b/activesupport/test/core_ext/duplicable_test.rb
@@ -1,9 +1,10 @@
 require 'abstract_unit'
 require 'bigdecimal'
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/numeric/time'
 
 class DuplicableTest < Test::Unit::TestCase
-  NO  = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56'), Class.new]
+  NO  = [nil, false, true, :symbol, 1, 2.3, BigDecimal.new('4.56'), Class.new, Module.new, 5.seconds]
   YES = ['1', Object.new, /foo/, [], {}, Time.now]
 
   def test_duplicable
diff --git a/activesupport/test/core_ext/hash_ext_test.rb b/activesupport/test/core_ext/hash_ext_test.rb
index b2c85f15cb..0b3f18faec 100644
--- a/activesupport/test/core_ext/hash_ext_test.rb
+++ b/activesupport/test/core_ext/hash_ext_test.rb
@@ -971,9 +971,10 @@ class HashToXmlTest < Test::Unit::TestCase
     assert_nil hash_wia.default
   end
 
-  def test_should_return_self_for_with_indifferent_access
+  def test_should_return_dup_for_with_indifferent_access
     hash_wia = HashWithIndifferentAccess.new
     assert_equal hash_wia, hash_wia.with_indifferent_access
+    assert_not_same hash_wia, hash_wia.with_indifferent_access
   end
 
   def test_should_copy_the_default_value_when_converting_to_hash_with_indifferent_access
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index ede9b0a6aa..995bc0751a 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -52,10 +52,10 @@ class KernelTest < Test::Unit::TestCase
     class << o; @x = 1; end
     assert_equal 1, o.class_eval { @x }
   end
-  
+
   def test_capture
-    assert_equal 'STDERR', capture(:stderr) {$stderr.print 'STDERR'}
-    assert_equal 'STDOUT', capture(:stdout) {print 'STDOUT'}
+    assert_equal 'STDERR', capture(:stderr) { $stderr.print 'STDERR' }
+    assert_equal 'STDOUT', capture(:stdout) { print 'STDOUT' }
   end
 end
 
@@ -73,3 +73,43 @@ class KernelSuppressTest < Test::Unit::TestCase
     suppress(LoadError, ArgumentError) { raise ArgumentError }
   end
 end
+
+class MockStdErr
+  attr_reader :output
+  def puts(message)
+    @output ||= []
+    @output << message
+  end
+
+  def info(message)
+    puts(message)
+  end
+
+  def write(message)
+    puts(message)
+  end
+end
+
+class KernelDebuggerTest < Test::Unit::TestCase
+  def test_debugger_not_available_message_to_stderr
+    old_stderr = $stderr
+    $stderr = MockStdErr.new
+    debugger
+    assert_match(/Debugger requested/, $stderr.output.first)
+  ensure
+    $stderr = old_stderr
+  end
+
+  def test_debugger_not_available_message_to_rails_logger
+    rails = Class.new do
+      def self.logger
+        @logger ||= MockStdErr.new
+      end
+    end
+    Object.const_set("Rails", rails)
+    debugger
+    assert_match(/Debugger requested/, rails.logger.output.first)
+  ensure
+    Object.send(:remove_const, "Rails")
+  end
+end
+\ No newline at end of file
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index 5d68b198f2..beb371d987 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -99,7 +99,13 @@ class ObjectTryTest < Test::Unit::TestCase
   def test_nonexisting_method
     method = :undefined_method
     assert !@string.respond_to?(method)
-    assert_raise(NoMethodError) { @string.try(method) }
+    assert_nil @string.try(method)
+  end
+  
+  def test_nonexisting_method_with_arguments
+    method = :undefined_method
+    assert !@string.respond_to?(method)
+    assert_nil @string.try(method, 'llo', 'y')
   end
 
   def test_valid_method