From bc5314a10231983c46ab81488935b259cdf36a04 Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Sun, 2 Jun 2013 00:39:11 +0900
Subject: Raise ArgumentError to fix Rails 4.1 deprecation warn message.

---
 actionpack/lib/action_view/helpers/asset_tag_helper.rb |  6 +-----
 actionpack/test/template/asset_tag_helper_test.rb      | 12 +++++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 3a6f449eb8..2b3a3c6a29 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -127,11 +127,7 @@ module ActionView
       #   # => <link rel="alternate" type="application/rss+xml" title="Example RSS" href="http://www.example.com/feed" />
       def auto_discovery_link_tag(type = :rss, url_options = {}, tag_options = {})
         if !(type == :rss || type == :atom) && tag_options[:type].blank?
-          message = "You have passed type other than :rss or :atom to auto_discovery_link_tag and haven't supplied " +
-                    "the :type option key. This behavior is deprecated and will be remove in Rails 4.1. You should pass " +
-                    ":type option explicitly if you want to use other types, for example: " +
-                    "auto_discovery_link_tag(:xml, '/feed.xml', :type => 'application/xml')"
-          ActiveSupport::Deprecation.warn message
+          raise ArgumentError.new("You should pass :type tag_option key explicitly, because you have passed #{type} type other than :rss or :atom.")
         end
 
         tag(
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
 
-- 
cgit v1.2.3