2 files changed, 20 insertions, 3 deletions
diff --git a/activesupport/test/core_ext/marshal_test.rb b/activesupport/test/core_ext/marshal_test.rb
index 07c0c0d8cb..380f64c6fd 100644
--- a/activesupport/test/core_ext/marshal_test.rb
+++ b/activesupport/test/core_ext/marshal_test.rb
@@ -29,7 +29,12 @@ class MarshalTest < ActiveSupport::TestCase
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
-      assert_kind_of EM, Marshal.load(dumped)
+      object = nil
+      assert_nothing_raised do
+        object = Marshal.load(dumped)
+      end
+
+      assert_kind_of EM, object
     end
   end
 
@@ -43,7 +48,12 @@ class MarshalTest < ActiveSupport::TestCase
     ActiveSupport::Dependencies.clear
 
     with_autoloading_fixtures do
-      assert_kind_of ClassFolder::ClassFolderSubclass, Marshal.load(dumped)
+      object = nil
+      assert_nothing_raised do
+        object = Marshal.load(dumped)
+      end
+
+      assert_kind_of ClassFolder::ClassFolderSubclass, object
     end
   end
 
@@ -128,7 +138,12 @@ class MarshalTest < ActiveSupport::TestCase
       ActiveSupport::Dependencies.clear
 
       with_autoloading_fixtures do
-        assert_kind_of EM, Marshal.load(f)
+        object = nil
+        assert_nothing_raised do
+          object = Marshal.load(f)
+        end
+
+        assert_kind_of EM, object
       end
     end
   end
diff --git a/activesupport/test/number_helper_test.rb b/activesupport/test/number_helper_test.rb
index 6696111476..074c872efc 100644
--- a/activesupport/test/number_helper_test.rb
+++ b/activesupport/test/number_helper_test.rb
@@ -57,6 +57,8 @@ module ActiveSupport
           assert_equal("+18005551212", number_helper.number_to_phone(8005551212, :country_code => 1, :delimiter => ''))
           assert_equal("22-555-1212", number_helper.number_to_phone(225551212))
           assert_equal("+45-22-555-1212", number_helper.number_to_phone(225551212, :country_code => 45))
+          assert_equal("(755) 6123-4567", number_helper.number_to_phone(75561234567, pattern: /(\d{3,4})(\d{4})(\d{4})/, area_code: true))
+          assert_equal("133-1234-5678", number_helper.number_to_phone(13312345678, pattern: /(\d{3})(\d{4})(\d{4})/))
         end
       end