Merge pull request #10821 from kennyj/deprecations_4_1-2

Remove some deprecated methods in Rails 4.1 again.

3 files changed, 7 insertions, 26 deletions

diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 6a2eb7da9f..8a19129695 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -185,11 +185,6 @@ class MimeTypeTest < ActiveSupport::TestCase
     all_types.uniq!
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
     all_types.delete_if { |type| !Mime.const_defined?(type.upcase) }
-    assert_deprecated do
-      verified, unverified = all_types.partition { |type| Mime::Type.browser_generated_types.include? type }
-      assert verified.each   { |type| assert  Mime.const_get(type.upcase).verify_request?, "Verifiable Mime Type is not verified: #{type.inspect}" }
-      assert unverified.each { |type| assert !Mime.const_get(type.upcase).verify_request?, "Nonverifiable Mime Type is verified: #{type.inspect}" }
-    end
   end
 
   test "references gives preference to symbols before strings" do
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index 6d239d0a0c..42067854ee 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -174,22 +174,6 @@ class RackRequestParamsParsingTest < BaseRackTest
   end
 end
 
-class RackRequestContentTypeTest < BaseRackTest
-  test "html content type verification" do
-    assert_deprecated do
-      @request.env['CONTENT_TYPE'] = Mime::HTML.to_s
-      assert @request.content_mime_type.verify_request?
-    end
-  end
-
-  test "xml content type verification" do
-    assert_deprecated do
-      @request.env['CONTENT_TYPE'] = Mime::XML.to_s
-      assert !@request.content_mime_type.verify_request?
-    end
-  end
-end
-
 class RackRequestNeedsRewoundTest < BaseRackTest
   test "body should be rewound" do
     data = 'foo'
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index 67f593c22f..8d0ab7fd81 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -298,13 +298,15 @@ class AssetTagHelperTest < ActionView::TestCase
     %(font_path("font.ttf?123")) => %(/fonts/font.ttf?123)
   }
 
-  def test_autodiscovery_link_tag_deprecated_types
-    result = nil
-    assert_deprecated do
-      result = auto_discovery_link_tag(:xml)
+  def test_autodiscovery_link_tag_with_unknown_type_but_not_pass_type_option_key
+    assert_raise(ArgumentError) do
+      auto_discovery_link_tag(:xml)
     end
+  end
 
-    expected = %(<link href="http://www.example.com" rel="alternate" title="XML" type="application/xml" />)
+  def test_autodiscovery_link_tag_with_unknown_type
+    result = auto_discovery_link_tag(:xml, '/feed.xml', :type => 'application/xml')
+    expected = %(<link href="/feed.xml" rel="alternate" title="XML" type="application/xml" />)
     assert_equal expected, result
   end