2 files changed, 15 insertions, 3 deletions
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index a7d833f49d..bbcee24f5c 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -87,6 +87,18 @@ class DeprecationTest < Test::Unit::TestCase
     flunk 'assert_deprecated should match any warning in block, not just the last one'
   end
 
+  def test_assert_not_deprecated_returns_result_of_block
+    assert_equal 123, assert_not_deprecated { 123 }
+  end
+
+  def test_assert_deprecated_returns_result_of_block
+    result = assert_deprecated('abc') do
+      ActiveSupport::Deprecation.warn 'abc'
+      123
+    end
+    assert_equal 123, result
+  end
+
   def test_silence
     ActiveSupport::Deprecation.silence do
       assert_not_deprecated { @dtc.partially }
diff --git a/activesupport/test/reloadable_test.rb b/activesupport/test/reloadable_test.rb
index 18120b39a7..eca21295b4 100644
--- a/activesupport/test/reloadable_test.rb
+++ b/activesupport/test/reloadable_test.rb
@@ -96,18 +96,18 @@ class ReloadableTest < Test::Unit::TestCase
   
   def test_include_subclasses_should_warn
     c = Class.new
-    deps = collect_deprecations do
+    result, deps = collect_deprecations do
       c.send :include, Reloadable::Subclasses
     end
     assert_equal 1, deps.size
     assert_match %r{Reloadable::Subclasses}, deps.first
-    
+
     assert_deprecated_reloadable { c.reloadable? }
   end
   
   def test_include_deprecated_should_not_warn
     c = Class.new
-    deps = collect_deprecations do
+    result, deps = collect_deprecations do
       c.send :include, Reloadable::Deprecated
     end
     assert_equal 0, deps.size