! assert_throws returns the value returned, if any. (volmer)

[git-p4: depot-paths = "//src/minitest/dev/": change = 13123]

lib/minitest/assertions.rb

@@ -473,7 +473,7 @@ def assert_silent
     def assert_throws sym, msg = nil
       default = "Expected #{mu_pp(sym)} to have been thrown"
       caught = true
-      catch(sym) do
+      value = catch(sym) do
         begin
           yield
         rescue ThreadError => e       # wtf?!? 1.8 + threads == suck
@@ -489,6 +489,7 @@ def assert_throws sym, msg = nil
       end
 
       assert caught, message(msg) { default }
+      value
     rescue Assertion
       raise
     rescue => e

test/minitest/test_minitest_assertions.rb

@@ -995,9 +995,19 @@ def test_assert_silent_triggered_out
   end
 
   def test_assert_throws
-    @tc.assert_throws :blah do
+    v = @tc.assert_throws :blah do
       throw :blah
     end
+
+    assert_nil v
+  end
+
+  def test_assert_throws_value
+    v = @tc.assert_throws :blah do
+      throw :blah, 42
+    end
+
+    assert_equal 42, v
   end
 
   def test_assert_throws_argument_exception

test/minitest/test_minitest_spec.rb

@@ -590,9 +590,10 @@ def assert_success spec
   end
 
   it "needs to verify throw" do
-    @assertion_count += 2 # 2 extra tests
+    @assertion_count += 4 # 2 extra tests
 
-    assert_success expect { throw :blah }.must_throw(:blah)
+    assert_nil expect { throw :blah }.must_throw(:blah)
+    assert_equal 42, expect { throw :blah, 42 }.must_throw(:blah)
 
     assert_triggered "Expected :blah to have been thrown." do
       expect {}.must_throw :blah