Merge commit 'mainstream/master'

2 files changed, 19 insertions, 9 deletions

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 2f79b6f67f..0bdbd14f33 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -256,21 +256,13 @@ class ObjectTryTest < Test::Unit::TestCase
   def test_nonexisting_method
     method = :undefined_method
     assert !@string.respond_to?(method)
-    assert_nil @string.try(method)
+    assert_raises(NoMethodError) { @string.try(method) }
   end
   
   def test_valid_method
     assert_equal 5, @string.try(:size)
   end
 
-  def test_valid_private_method
-    class << @string
-      private :size
-    end
-
-    assert_equal 5, @string.try(:size)
-  end
-
   def test_argument_forwarding
     assert_equal 'Hey', @string.try(:sub, 'llo', 'y')
   end
@@ -278,4 +270,13 @@ class ObjectTryTest < Test::Unit::TestCase
   def test_block_forwarding
     assert_equal 'Hey', @string.try(:sub, 'llo') { |match| 'y' }
   end
+
+  def test_nil_to_type
+    assert_nil nil.try(:to_s)
+    assert_nil nil.try(:to_i)
+  end
+
+  def test_false_try
+    assert_equal 'false', false.try(:to_s)
+  end
 end
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 7c8fb7dd94..4dc1fec559 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -105,6 +105,15 @@ class TimeWithZoneTest < Test::Unit::TestCase
     end
   end
 
+  def test_xmlschema_with_fractional_seconds
+    silence_warnings do # silence warnings raised by tzinfo gem
+      @twz += 0.123456 # advance the time by a fraction of a second
+      assert_equal "1999-12-31T19:00:00.123-05:00", @twz.xmlschema(3)
+      assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(6)
+      assert_equal "1999-12-31T19:00:00.123456-05:00", @twz.xmlschema(12)
+    end
+  end
+
   def test_to_yaml
     silence_warnings do # silence warnings raised by tzinfo gem
       assert_equal "--- 1999-12-31 19:00:00 -05:00\n", @twz.to_yaml