diff options
-rw-r--r-- | test/ruby/test_enumerator.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_pack.rb | 4 | ||||
-rw-r--r-- | tool/lib/test/unit/assertions.rb | 2 | ||||
-rw-r--r-- | tool/test/testunit/test_minitest_unit.rb | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 4342c10d02..c823b79c6d 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -79,7 +79,7 @@ class TestEnumerator < Test::Unit::TestCase assert_raise(NoMethodError) { enum.each {} } enum.freeze assert_raise(ArgumentError) { - capture_io do + capture_output do # warning: Enumerator.new without a block is deprecated; use Object#to_enum enum.__send__(:initialize, @obj, :foo) end diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 60edd00186..c9ca9c3dfd 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -764,7 +764,7 @@ EXPECTED $VERBOSE = true - _, err = capture_io do + _, err = capture_output do assert_equal "\000", [0].pack("*U") end @@ -783,7 +783,7 @@ EXPECTED $VERBOSE = true - _, err = capture_io do + _, err = capture_output do assert_equal [0], "\000".unpack("*U") end diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index ecbcf7476e..065a7a0a46 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -214,7 +214,7 @@ module Test # See also: #assert_silent def assert_output stdout = nil, stderr = nil - out, err = capture_io do + out, err = capture_output do yield end diff --git a/tool/test/testunit/test_minitest_unit.rb b/tool/test/testunit/test_minitest_unit.rb index ee20d1bbb8..7bbcade5c1 100644 --- a/tool/test/testunit/test_minitest_unit.rb +++ b/tool/test/testunit/test_minitest_unit.rb @@ -1070,11 +1070,11 @@ class TestMiniTestUnitTestCase < Test::Unit::TestCase end end - def test_capture_io + def test_capture_output @assertion_count = 0 non_verbose do - out, err = capture_io do + out, err = capture_output do puts 'hi' $stderr.puts 'bye!' end |