3 files changed, 0 insertions, 68 deletions
diff --git a/activesupport/test/core_ext/big_decimal/yaml_conversions_test.rb b/activesupport/test/core_ext/big_decimal/yaml_conversions_test.rb
deleted file mode 100644
index e634679d20..0000000000
--- a/activesupport/test/core_ext/big_decimal/yaml_conversions_test.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'abstract_unit'
-
-class BigDecimalYamlConversionsTest < ActiveSupport::TestCase
-  def test_to_yaml
-    assert_deprecated { require 'active_support/core_ext/big_decimal/yaml_conversions' }
-    assert_match("--- 100000.30020320320000000000000000000000000000001\n", BigDecimal.new('100000.30020320320000000000000000000000000000001').to_yaml)
-    assert_match("--- .Inf\n",  BigDecimal.new('Infinity').to_yaml)
-    assert_match("--- .NaN\n",  BigDecimal.new('NaN').to_yaml)
-    assert_match("--- -.Inf\n", BigDecimal.new('-Infinity').to_yaml)
-  end
-end
diff --git a/activesupport/test/core_ext/kernel_test.rb b/activesupport/test/core_ext/kernel_test.rb
index a87af0007c..8abbd6c69b 100644
--- a/activesupport/test/core_ext/kernel_test.rb
+++ b/activesupport/test/core_ext/kernel_test.rb
@@ -15,7 +15,6 @@ class KernelTest < ActiveSupport::TestCase
     assert_equal old_verbose, $VERBOSE
   end
 
-
   def test_enable_warnings
     enable_warnings { assert_equal true, $VERBOSE }
     assert_equal 1234, enable_warnings { 1234 }
@@ -29,57 +28,11 @@ class KernelTest < ActiveSupport::TestCase
     assert_equal old_verbose, $VERBOSE
   end
 
-
-  def test_silence_stream
-    old_stream_position = STDOUT.tell
-    silence_stream(STDOUT) { STDOUT.puts 'hello world' }
-    assert_equal old_stream_position, STDOUT.tell
-  rescue Errno::ESPIPE
-    # Skip if we can't stream.tell
-  end
-
-  def test_silence_stream_closes_file_descriptors
-    stream     = StringIO.new
-    dup_stream = StringIO.new
-    stream.stubs(:dup).returns(dup_stream)
-    dup_stream.expects(:close)
-    silence_stream(stream) { stream.puts 'hello world' }
-  end
-
-  def test_quietly
-    old_stdout_position, old_stderr_position = STDOUT.tell, STDERR.tell
-    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
-  rescue Errno::ESPIPE
-    # Skip if we can't STDERR.tell
-  end
-
   def test_class_eval
     o = Object.new
     class << o; @x = 1; end
     assert_equal 1, o.class_eval { @x }
   end
-
-  def test_capture
-    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
 
 class KernelSuppressTest < ActiveSupport::TestCase
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index 0af207fae9..cdc695f036 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -667,16 +667,6 @@ class OutputSafetyTest < ActiveSupport::TestCase
     assert_equal other, "&lt;foo&gt;other"
   end
 
-  test "Deprecated #prepend! method is still present" do
-    other = "other".html_safe
-
-    assert_deprecated do
-      other.prepend! "<foo>"
-    end
-
-    assert_equal other, "&lt;foo&gt;other"
-  end
-
   test "Concatting safe onto unsafe yields unsafe" do
     @other_string = "other"