Backport from ruby/ruby

kou · kou · commit bbf4cb578062 · 2019-10-12T07:45:53.000+09:00
diff --git a/lib/csv.rb b/lib/csv.rb
@@ -1326,7 +1326,7 @@ def shift
   # ASCII compatible String.
   #
   def inspect
-    str = ["<#", self.class.to_s, " io_type:"]
+    str = ["#<", self.class.to_s, " io_type:"]
     # show type of wrapped IO
     if    @io == $stdout then str << "$stdout"
     elsif @io == $stdin  then str << "$stdin"
diff --git a/test/csv/helper.rb b/test/csv/helper.rb
@@ -3,7 +3,7 @@
 
 require "csv"
 
-require_relative "../lib/with_different_ofs.rb"
+require_relative "../lib/with_different_ofs"
 
 module Helper
   def with_chunk_size(chunk_size)
diff --git a/test/csv/interface/test_read.rb b/test/csv/interface/test_read.rb
@@ -104,7 +104,7 @@ def test_open_encoding_invalid
   end
 
   def test_open_encoding_nonexistent
-    _output, error = capture_io do
+    _output, error = capture_output do
       CSV.open(@input.path, encoding: "nonexistent") do
       end
     end
diff --git a/test/lib/minitest/unit.rb b/test/lib/minitest/unit.rb
@@ -484,6 +484,7 @@ def capture_io
 
       return captured_stdout.string, captured_stderr.string
     end
+    alias capture_output capture_io
 
     ##
     # Captures $stdout and $stderr into strings, using Tempfile to
