2 files changed, 34 insertions, 19 deletions
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index d8bf81d02b..a87af0007c 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -30,14 +30,6 @@ class KernelTest < ActiveSupport::TestCase
   end
 
 
-  def test_silence_stderr
-    old_stderr_position = STDERR.tell
-    silence_stderr { STDERR.puts 'hello world' }
-    assert_equal old_stderr_position, STDERR.tell
-  rescue Errno::ESPIPE
-    # Skip if we can't STDERR.tell
-  end
-
   def test_silence_stream
     old_stream_position = STDOUT.tell
     silence_stream(STDOUT) { STDOUT.puts 'hello world' }
@@ -56,9 +48,11 @@ class KernelTest < ActiveSupport::TestCase
 
   def test_quietly
     old_stdout_position, old_stderr_position = STDOUT.tell, STDERR.tell
-    quietly do
-      puts 'see me, feel me'
-      STDERR.puts 'touch me, heal me'
+    assert_deprecated do
+      quietly do
+        puts 'see me, feel me'
+        STDERR.puts 'touch me, heal me'
+      end
     end
     assert_equal old_stdout_position, STDOUT.tell
     assert_equal old_stderr_position, STDERR.tell
@@ -66,10 +60,6 @@ class KernelTest < ActiveSupport::TestCase
     # Skip if we can't STDERR.tell
   end
 
-  def test_silence_stderr_with_return_value
-    assert_equal 1, silence_stderr { 1 }
-  end
-
   def test_class_eval
     o = Object.new
     class << o; @x = 1; end
@@ -77,10 +67,18 @@ class KernelTest < ActiveSupport::TestCase
   end
 
   def test_capture
-    assert_equal 'STDERR', capture(:stderr) { $stderr.print 'STDERR' }
-    assert_equal 'STDOUT', capture(:stdout) { print 'STDOUT' }
-    assert_equal "STDERR\n", capture(:stderr) { system('echo STDERR 1>&2') }
-    assert_equal "STDOUT\n", capture(:stdout) { system('echo STDOUT') }
+    assert_deprecated do
+      assert_equal 'STDERR', capture(:stderr) { $stderr.print 'STDERR' }
+    end
+    assert_deprecated do
+      assert_equal 'STDOUT', capture(:stdout) { print 'STDOUT' }
+    end
+    assert_deprecated do
+      assert_equal "STDERR\n", capture(:stderr) { system('echo STDERR 1>&2') }
+    end
+    assert_deprecated do
+      assert_equal "STDOUT\n", capture(:stdout) { system('echo STDOUT') }
+    end
   end
 end
 
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index ee1c69502e..7aff56cbad 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -355,4 +355,21 @@ class DeprecationTest < ActiveSupport::TestCase
       end
       deprecator
     end
+
+    def capture(stream)
+      stream = stream.to_s
+      captured_stream = Tempfile.new(stream)
+      stream_io = eval("$#{stream}")
+      origin_stream = stream_io.dup
+      stream_io.reopen(captured_stream)
+
+      yield
+
+      stream_io.rewind
+      return captured_stream.read
+    ensure
+      captured_stream.close
+      captured_stream.unlink
+      stream_io.reopen(origin_stream)
+    end
 end