test/test_helper.rb in asciidoctor-1.5.3 vs test/test_helper.rb in asciidoctor-1.5.4

@@ -8,33 +8,25 @@
 
 require 'simplecov' if ENV['COVERAGE'] == 'true'
 
 require File.join(ASCIIDOCTOR_PROJECT_DIR, 'lib', 'asciidoctor')
 
-# NOTE we require minitest libraries explicitly to avoid a superfluous warning
-require 'minitest/unit'
-require 'minitest/spec'
-require 'minitest/mock'
-MiniTest::Unit.autorun
-
 require 'socket'
 require 'nokogiri'
 require 'tmpdir'
 
 autoload :FileUtils, 'fileutils'
 autoload :Pathname,  'pathname'
 
 RE_XMLNS_ATTRIBUTE = / xmlns="[^"]+"/
 RE_DOCTYPE = /\s*<!DOCTYPE (.*)/
 
-if defined? Minitest::Test
-  # We're on Minitest 5+. Nothing to do here.
-else
-  # Minitest 4 doesn't have Minitest::Test yet.
-  Minitest::Test = MiniTest::Unit::TestCase
-end
+require 'minitest/autorun'
 
+# Minitest 4 doesn't have Minitest::Test
+Minitest::Test = MiniTest::Unit::TestCase unless defined? Minitest::Test
+
 class Minitest::Test
   def windows?
     RbConfig::CONFIG['host_os'] =~ /win|ming/
   end
 
@@ -232,11 +224,11 @@
     [number].pack('U*')
   end
   alias :entity :expand_entity
 
   def invoke_cli_with_filenames(argv = [], filenames = [], &block)
-    
+
     filepaths = Array.new
 
     filenames.each { |filename|
       if filenames.nil?|| ::Pathname.new(filename).absolute?
         filepaths.push(filename)
@@ -268,18 +260,14 @@
     invoker.invoke!(&block)
     invoker
   end
 
   def redirect_streams
-    old_stdout = $stdout
-    old_stderr = $stderr
-    stdout = StringIO.new
-    stderr = StringIO.new
-    $stdout = stdout
-    $stderr = stderr
+    old_stdout, $stdout = $stdout, (tmp_stdout = ::StringIO.new)
+    old_stderr, $stderr = $stderr, (tmp_stderr = ::StringIO.new)
     begin
-      yield(stdout, stderr)
+      yield tmp_stdout, tmp_stderr
     ensure
       $stdout = old_stdout
       $stderr = old_stderr
     end
   end
@@ -302,11 +290,11 @@
           session.print %(HTTP/1.1 405 Method Not Allowed\r\nContent-Type: text/plain\r\n\r\n)
           session.print %(405 - Method not allowed\n)
           session.close
           break
         end
-      
+
         if resource == '/name/asciidoctor'
           session.print %(HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n)
           session.print %({"name": "asciidoctor"}\n)
         elsif File.file?(resource_file = (File.join base_dir, resource))
           mimetype = if (ext = ::File.extname(resource_file)[1..-1])
@@ -341,10 +329,10 @@
     end
   end
 end
 
 ###
-# 
+#
 # Context goodness provided by @citrusbyte's contest.
 # See https://github.com/citrusbyte/contest
 #
 ###