Use Minitest's output tests instead of our own

test/tests/brakeman.rb

@@ -148,22 +148,6 @@ def setup
     Brakeman.instance_variable_set(:@quiet, false)
   end
 
-  # method from test-unit: http://test-unit.rubyforge.org/test-unit/en/Test/Unit/Util/Output.html#capture_output-instance_method
-  def capture_output
-    require 'stringio'
-
-    output = StringIO.new
-    error = StringIO.new
-    stdout_save, stderr_save = $stdout, $stderr
-    $stdout, $stderr = output, error
-    begin
-      yield
-      [output.string, error.string]
-    ensure
-      $stdout, $stderr = stdout_save, stderr_save
-    end
-  end
-
   def test_quiet_option_from_file
     config = Tempfile.new("config")
 
@@ -179,13 +163,13 @@ def test_quiet_option_from_file
       :app_path => "/tmp" #doesn't need to be real
     }
 
-    assert_equal "", capture_output {
+    assert_output "" do
       final_options = Brakeman.set_options(options)
 
       config.unlink
 
       assert final_options[:quiet], "Expected quiet option to be true, but was #{final_options[:quiet]}"
-    }[1]
+    end
   end
 
   def test_quiet_option_from_commandline
@@ -204,9 +188,9 @@ def test_quiet_option_from_commandline
       :app_path => "/tmp" #doesn't need to be real
     }
 
-    assert_equal "", capture_output {
+    assert_output "" do
       final_options = Brakeman.set_options(options)
-    }[1]
+    end
   end
 
   def test_quiet_option_default
@@ -247,10 +231,10 @@ def test_quiet_inconfig_with_command_line
       :run_checks => []
     }
 
-    assert_equal "", capture_output {
+    assert_output "" do
       Brakeman.run options
       config.unlink
-    }[1]
+    end
   end
 
   def output_format_tester options, expected_options
@@ -306,7 +290,7 @@ def test_github_options_returns_url
 
   def test_optional_check_options
     options = {:list_optional_checks => true}
-    check_list = capture_output {
+    check_list = capture_io {
       Brakeman.list_checks(options)
     }[1]
     Brakeman::Checks.optional_checks.each do |check|
@@ -317,7 +301,7 @@ def test_optional_check_options
 
   def test_default_check_options
     options = {}
-    check_list = capture_output {
+    check_list = capture_io {
       Brakeman.list_checks(options)
     }[1]
     Brakeman::Checks.checks.each do |check|
@@ -328,31 +312,33 @@ def test_default_check_options
 
   def test_dump_config_no_file
     options = {:create_config => true, :test_option => "test"}
-    config_output = capture_output {
+
+    assert_output nil, "---\n:test_option: test\n" do
       Brakeman.dump_config(options)
-    }[1]
-    assert_equal config_output, "---\n:test_option: test\n"
+    end
   end
 
   def test_dump_config_with_set
     require 'set'
     test_set = Set.new ["test", "test2"]
     options = {:create_config => true, :test_option => test_set}
-    config_output = capture_output {
+
+    assert_output nil, "---\n:test_option:\n- test\n- test2\n" do
       Brakeman.dump_config(options)
-    }[1]
-    assert_equal config_output, "---\n:test_option:\n- test\n- test2\n"
+    end
   end
 
   def test_dump_config_with_file
     test_file = "test.cfg"
     options = {:create_config => test_file, :test_option => "test"}
-    config_output = capture_output {
+
+    assert_output nil, "Output configuration to test.cfg\n" do
       Brakeman.dump_config(options)
-    }[1]
-    assert_equal config_output, "Output configuration to test.cfg\n"
+    end
+
     file_text = File.read(test_file)
     assert_equal file_text, "---\n:test_option: test\n"
+  ensure
     assert File.delete test_file
   end
 end

test/tests/rake_task.rb

@@ -2,16 +2,6 @@
 require 'tmpdir'
 
 class RakeTaskTests < Minitest::Test
-  def setup
-    # Brakeman is noisy on errors
-    @old_stderr = $stderr.dup
-    $stderr.reopen("/dev/null", "w")
-  end
-
-  def cleanup
-    $stderr = @old_stderr
-  end
-
   def in_temp_app
     Dir.mktmpdir do |dir|
       begin