[rubygems/rubygems] Extract assert_output to assert_empty and assert_equal with capture_output

https://github.com/rubygems/rubygems/commit/f6759440a4

4 files changed, 14 insertions, 5 deletions

diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index 4f99bc8e58..b3c8a7abb5 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1966,9 +1966,11 @@ You may need to `gem install -g` to install missing gems
     EXPECTED
 
     Gem::Deprecate.skip_during do
-      assert_output nil, expected do
+      actual_stdout, actual_stderr = capture_output do
         Gem.use_gemdeps
       end
+      assert_empty actual_stdout
+      assert_equal(expected, actual_stderr)
     end
   ensure
     ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
diff --git a/test/rubygems/test_gem_request_set.rb b/test/rubygems/test_gem_request_set.rb
index 54ae7720c0..e2f0bf252b 100644
--- a/test/rubygems/test_gem_request_set.rb
+++ b/test/rubygems/test_gem_request_set.rb
@@ -87,9 +87,10 @@ Gems to install:
   a-2
       EXPECTED
 
-      assert_output expected do
+      actual, _= capture_output do
         rs.install_from_gemdeps :gemdeps => io.path, :explain => true
       end
+      assert_equal(expected, actual)
     end
   end
 
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 42988ad086..d4656c0d30 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -3021,9 +3021,11 @@ WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'
 Please report a bug if this causes problems.
     EXPECTED
 
-    assert_output nil, expected do
+    actual_stdout, actual_stderr = capture_output do
       specification.reset
     end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
   end
 
   def test_unresolved_specs_with_versions
@@ -3052,9 +3054,11 @@ WARN: Clearing out unresolved specs. Try 'gem cleanup <gem>'
 Please report a bug if this causes problems.
     EXPECTED
 
-    assert_output nil, expected do
+    actual_stdout, actual_stderr = capture_output do
       specification.reset
     end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
   end
 
   def test_duplicate_runtime_dependency
diff --git a/test/rubygems/test_gem_version.rb b/test/rubygems/test_gem_version.rb
index 7b382809c9..af37434d09 100644
--- a/test/rubygems/test_gem_version.rb
+++ b/test/rubygems/test_gem_version.rb
@@ -47,9 +47,11 @@ class TestGemVersion < Gem::TestCase
     assert_equal false, Gem::Version.correct?("an incorrect version")
 
     expected = "nil versions are discouraged and will be deprecated in Rubygems 4\n"
-    assert_output nil, expected do
+    actual_stdout, actual_stderr = capture_output do
       Gem::Version.correct?(nil)
     end
+    assert_empty actual_stdout
+    assert_equal(expected, actual_stderr)
   end
 
   def test_class_new_subclass