+ Add a descriptive error if assert_output or assert_raises called without a block. (okuramasafumi)

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

Author: zenspider

lib/minitest/assertions.rb

@@ -303,6 +303,9 @@ def assert_operator o1, op, o2 = UNDEFINED, msg = nil
     # See also: #assert_silent
 
     def assert_output stdout = nil, stderr = nil
+      flunk "assert_output requires a block to capture output." unless
+        block_given?
+
       out, err = capture_io do
         yield
       end
@@ -339,6 +342,9 @@ def assert_predicate o1, op, msg = nil
     # passed.
 
     def assert_raises *exp
+      flunk "assert_raises requires a block to capture errors." unless
+        block_given?
+
       msg = "#{exp.pop}.\n" if String === exp.last
       exp << StandardError if exp.empty?
 

test/minitest/test_minitest_assertions.rb

@@ -588,6 +588,12 @@ def test_assert_output_triggered_out
     end
   end
 
+  def test_assert_output_without_block
+    assert_triggered "assert_output requires a block to capture output." do
+      @tc.assert_output "blah"
+    end
+  end
+
   def test_assert_predicate
     @tc.assert_predicate "", :empty?
   end
@@ -767,6 +773,12 @@ def test_assert_raises_triggered_none_msg
     assert_equal expected, e.message
   end
 
+  def test_assert_raises_without_block
+    assert_triggered "assert_raises requires a block to capture errors." do
+      @tc.assert_raises StandardError
+    end
+  end
+
   def test_assert_respond_to
     @tc.assert_respond_to "blah", :empty?
   end