Merge pull request #10814 from kennyj/deprecations_4_1

Remove some deprecation methods / options / files.

14 files changed, 3 insertions, 363 deletions

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 9cacb3862b..9fdad63b45 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -46,10 +46,6 @@ module ActionController
   autoload :TestCase,           'action_controller/test_case'
   autoload :TemplateAssertions, 'action_controller/test_case'
 
-  eager_autoload do
-    autoload :RecordIdentifier
-  end
-
   def self.eager_load!
     super
     ActionController::Caching.eager_load!
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 971c4189c8..d7b09b67c0 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -223,7 +223,6 @@ module ActionController
       ForceSSL,
       Streaming,
       DataStreaming,
-      RecordIdentifier,
       HttpAuthentication::Basic::ControllerMethods,
       HttpAuthentication::Digest::ControllerMethods,
       HttpAuthentication::Token::ControllerMethods,
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb
deleted file mode 100644
index d598bac467..0000000000
--- a/actionpack/lib/action_controller/record_identifier.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'action_view/record_identifier'
-
-module ActionController
-  module RecordIdentifier
-    MODULE_MESSAGE = 'Calling ActionController::RecordIdentifier.%s is deprecated and ' \
-      'will be removed in Rails 4.1, please call using ActionView::RecordIdentifier instead.'
-    INSTANCE_MESSAGE = '%s method will no longer be included by default in controllers ' \
-      'since Rails 4.1. If you would like to use it in controllers, please include ' \
-      'ActionView::RecordIdentifier module.'
-
-    def dom_id(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_id')
-      ActionView::RecordIdentifier.dom_id(record, prefix)
-    end
-
-    def dom_class(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(INSTANCE_MESSAGE % 'dom_class')
-      ActionView::RecordIdentifier.dom_class(record, prefix)
-    end
-
-    def self.dom_id(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_id')
-      ActionView::RecordIdentifier.dom_id(record, prefix)
-    end
-
-    def self.dom_class(record, prefix = nil)
-      ActiveSupport::Deprecation.warn(MODULE_MESSAGE % 'dom_class')
-      ActionView::RecordIdentifier.dom_class(record, prefix)
-    end
-  end
-end
diff --git a/actionpack/lib/action_controller/vendor/html-scanner.rb b/actionpack/lib/action_controller/vendor/html-scanner.rb
deleted file mode 100644
index 896208bc05..0000000000
--- a/actionpack/lib/action_controller/vendor/html-scanner.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'action_view/vendor/html-scanner'
-require 'active_support/deprecation'
-
-ActiveSupport::Deprecation.warn 'Vendored html-scanner was moved to action_view, please require "action_view/vendor/html-scanner" instead. ' +
-                                'This file will be removed in Rails 4.1'
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index c10566a87d..3fa7696b83 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -426,22 +426,6 @@ module ActionView
       def submit_tag(value = "Save changes", options = {})
         options = options.stringify_keys
 
-        if disable_with = options.delete("disable_with")
-          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { disable_with: \'Text\' }' instead."
-          ActiveSupport::Deprecation.warn message
-
-          options["data-disable-with"] = disable_with
-        end
-
-        if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { confirm: \'Text\' }' instead'."
-          ActiveSupport::Deprecation.warn message
-
-          options["data-confirm"] = confirm
-        end
-
         tag :input, { "type" => "submit", "name" => "commit", "value" => value }.update(options)
       end
 
@@ -488,22 +472,6 @@ module ActionView
         options ||= {}
         options = options.stringify_keys
 
-        if disable_with = options.delete("disable_with")
-          message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { disable_with: \'Text\' }' instead."
-          ActiveSupport::Deprecation.warn message
-
-          options["data-disable-with"] = disable_with
-        end
-
-        if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { confirm: \'Text\' }' instead'."
-          ActiveSupport::Deprecation.warn message
-
-          options["data-confirm"] = confirm
-        end
-
         options.reverse_merge! 'name' => 'button', 'type' => 'submit'
 
         content_tag :button, content_or_options || 'Button', options, &block
@@ -541,15 +509,6 @@ module ActionView
       #   # => <input alt="Save" src="/images/save.png" data-confirm="Are you sure?" type="image" />
       def image_submit_tag(source, options = {})
         options = options.stringify_keys
-
-        if confirm = options.delete("confirm")
-          message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
-                    "Use 'data: { confirm: \'Text\' }' instead'."
-          ActiveSupport::Deprecation.warn message
-
-          options["data-confirm"] = confirm
-        end
-
         tag :input, { "alt" => image_alt(source), "type" => "image", "src" => path_to_image(source) }.update(options)
       end
 
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index edff98ddaa..e475d5b018 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -70,48 +70,6 @@ module ActionView
       def javascript_cdata_section(content) #:nodoc:
         "\n//#{cdata_section("\n#{content}\n//")}\n".html_safe
       end
-
-      # Returns a button whose +onclick+ handler triggers the passed JavaScript.
-      #
-      # The helper receives a name, JavaScript code, and an optional hash of HTML options. The
-      # name is used as button label and the JavaScript code goes into its +onclick+ attribute.
-      # If +html_options+ has an <tt>:onclick</tt>, that one is put before +function+.
-      #
-      #   button_to_function "Greeting", "alert('Hello world!')", class: "ok"
-      #   # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
-      #
-      def button_to_function(name, function=nil, html_options={})
-        message = "button_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
-          "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
-        ActiveSupport::Deprecation.warn message
-
-        onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
-
-        tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
-      end
-
-      # Returns a link whose +onclick+ handler triggers the passed JavaScript.
-      #
-      # The helper receives a name, JavaScript code, and an optional hash of HTML options. The
-      # name is used as the link text and the JavaScript code goes into the +onclick+ attribute.
-      # If +html_options+ has an <tt>:onclick</tt>, that one is put before +function+. Once all
-      # the JavaScript is set, the helper appends "; return false;".
-      #
-      # The +href+ attribute of the tag is set to "#" unless +html_options+ has one.
-      #
-      #   link_to_function "Greeting", "alert('Hello world!')", class: "nav_link"
-      #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
-      #
-      def link_to_function(name, function, html_options={})
-        message = "link_to_function is deprecated and will be removed from Rails 4.1. We recommend using Unobtrusive JavaScript instead. " +
-          "See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
-        ActiveSupport::Deprecation.warn message
-
-        onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
-        href = html_options[:href] || '#'
-
-        content_tag(:a, name, html_options.merge(:href => href, :onclick => onclick))
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 22059a0170..8a83f6f356 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -548,28 +548,10 @@ module ActionView
             html_options = html_options.stringify_keys
             html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
 
-            disable_with = html_options.delete("disable_with")
-            confirm = html_options.delete('confirm')
             method  = html_options.delete('method')
 
-            if confirm
-              message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
-                        "Use 'data: { confirm: \'Text\' }' instead."
-              ActiveSupport::Deprecation.warn message
-
-              html_options["data-confirm"] = confirm
-            end
-
             add_method_to_attributes!(html_options, method) if method
 
-            if disable_with
-              message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
-                        "Use 'data: { disable_with: \'Text\' }' instead."
-              ActiveSupport::Deprecation.warn message
-
-              html_options["data-disable-with"] = disable_with
-            end
-
             html_options
           else
             link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index ebbc1c79d6..c25b1efc2b 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -146,12 +146,6 @@ module ActionView
       handle_render_error(view, e)
     end
 
-    def mime_type
-      message = 'Template#mime_type is deprecated and will be removed in Rails 4.1. Please use type method instead.'
-      ActiveSupport::Deprecation.warn message
-      @mime_type ||= Mime::Type.lookup_by_extension(@formats.first.to_s) if @formats.first
-    end
-
     def type
       @type ||= Types[@formats.first] if @formats.first
     end
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index d4f18d55a6..b2bfdae174 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -61,10 +61,7 @@ class UrlOptionsController < ActionController::Base
   end
 end
 
-class RecordIdentifierController < ActionController::Base
-end
-
-class RecordIdentifierWithoutDeprecationController < ActionController::Base
+class RecordIdentifierIncludedController < ActionController::Base
   include ActionView::RecordIdentifier
 end
 
@@ -88,43 +85,20 @@ class ControllerClassTests < ActiveSupport::TestCase
     assert_equal 'contained_empty', Submodule::ContainedEmptyController.controller_name
   end
 
-  def test_record_identifier
-    assert_respond_to RecordIdentifierController.new, :dom_id
-    assert_respond_to RecordIdentifierController.new, :dom_class
-  end
-
-  def test_record_identifier_is_deprecated
-    record = Comment.new
-    record.save
-
-    dom_id = nil
-    assert_deprecated 'dom_id method will no longer' do
-      dom_id = RecordIdentifierController.new.dom_id(record)
-    end
-
-    assert_equal 'comment_1', dom_id
-
-    dom_class = nil
-    assert_deprecated 'dom_class method will no longer' do
-      dom_class = RecordIdentifierController.new.dom_class(record)
-    end
-    assert_equal 'comment', dom_class
-  end
-
   def test_no_deprecation_when_action_view_record_identifier_is_included
     record = Comment.new
     record.save
 
     dom_id = nil
     assert_not_deprecated do
-      dom_id = RecordIdentifierWithoutDeprecationController.new.dom_id(record)
+      dom_id = RecordIdentifierIncludedController.new.dom_id(record)
     end
 
     assert_equal 'comment_1', dom_id
 
     dom_class = nil
     assert_not_deprecated do
-      dom_class = RecordIdentifierWithoutDeprecationController.new.dom_class(record)
+      dom_class = RecordIdentifierIncludedController.new.dom_class(record)
     end
     assert_equal 'comment', dom_class
   end
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb
deleted file mode 100644
index ff5d7fd3bd..0000000000
--- a/actionpack/test/controller/record_identifier_test.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'abstract_unit'
-require 'controller/fake_models'
-
-class ControllerRecordIdentifierTest < ActiveSupport::TestCase
-  include ActionController::RecordIdentifier
-
-  def setup
-    @record = Comment.new
-  end
-
-  def test_dom_id_deprecation
-    assert_deprecated(/dom_id method will no longer be included by default in controllers/) do
-      dom_id(@record)
-    end
-  end
-
-  def test_dom_class_deprecation
-    assert_deprecated(/dom_class method will no longer be included by default in controllers/) do
-      dom_class(@record)
-    end
-  end
-
-  def test_dom_id_from_module_deprecation
-    assert_deprecated(/Calling ActionController::RecordIdentifier.dom_id is deprecated/) do
-      ActionController::RecordIdentifier.dom_id(@record)
-    end
-  end
-
-  def test_dom_class_from_module_deprecation
-    assert_deprecated(/Calling ActionController::RecordIdentifier.dom_class is deprecated/) do
-      ActionController::RecordIdentifier.dom_class(@record)
-    end
-  end
-end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 6c6a142397..70fc6a588b 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -410,15 +410,6 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
-  def test_submit_tag_with_deprecated_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %(<input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />),
-        submit_tag("Save", :confirm => "Are you sure?")
-      )
-    end
-  end
-
   def test_button_tag
     assert_dom_equal(
       %(<button name="button" type="submit">Button</button>),
@@ -477,15 +468,6 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
-  def test_button_tag_with_deprecated_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %(<button name="button" type="submit" data-confirm="Are you sure?">Save</button>),
-        button_tag("Save", :type => "submit", :confirm => "Are you sure?")
-      )
-    end
-  end
-
   def test_image_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input alt="Save" type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
@@ -493,16 +475,6 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
-  def test_image_submit_tag_with_deprecated_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %(<input alt="Save" type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
-        image_submit_tag("save.gif", :confirm => "Are you sure?")
-      )
-    end
-  end
-
-
   def test_color_field_tag
     expected = %{<input id="car" name="car" type="color" />}
     assert_dom_equal(expected, color_field_tag("car"))
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 1eed8adb62..de6a6eaab3 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -42,48 +42,6 @@ class JavaScriptHelperTest < ActionView::TestCase
     assert_instance_of ActiveSupport::SafeBuffer, escape_javascript(ActiveSupport::SafeBuffer.new(given))
   end
 
-  def test_button_to_function
-    assert_deprecated do
-      assert_dom_equal %(<input type="button" onclick="alert(&#39;Hello world!&#39;);" value="Greeting" />),
-        button_to_function("Greeting", "alert('Hello world!')")
-    end
-  end
-
-  def test_button_to_function_with_onclick
-    assert_deprecated do
-      assert_dom_equal "<input onclick=\"alert(&#39;Goodbye World :(&#39;); alert(&#39;Hello world!&#39;);\" type=\"button\" value=\"Greeting\" />",
-        button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
-    end
-  end
-
-  def test_button_to_function_without_function
-    assert_deprecated do
-      assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
-        button_to_function("Greeting")
-    end
-  end
-
-  def test_link_to_function
-    assert_deprecated do
-      assert_dom_equal %(<a href="#" onclick="alert(&#39;Hello world!&#39;); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')")
-    end
-  end
-
-  def test_link_to_function_with_existing_onclick
-    assert_deprecated do
-      assert_dom_equal %(<a href="#" onclick="confirm(&#39;Sanity!&#39;); alert(&#39;Hello world!&#39;); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
-    end
-  end
-
-  def test_function_with_href
-    assert_deprecated do
-      assert_dom_equal %(<a href="http://example.com/" onclick="alert(&#39;Hello world!&#39;); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
-    end
-  end
-
   def test_javascript_tag
     self.output_buffer = 'foo'
 
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 8d32205fb8..c94508d678 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -64,13 +64,6 @@ class TestERBTemplate < ActiveSupport::TestCase
     @context = Context.new
   end
 
-  def test_mime_type_is_deprecated
-    template = new_template
-    assert_deprecated 'Template#mime_type is deprecated and will be removed' do
-      template.mime_type
-    end
-  end
-
   def test_basic_template
     @template = new_template
     assert_equal "Hello", render
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 9b4c419807..f63f235a5c 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -93,15 +93,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_button_to_with_deprecated_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<form method="post" action="http://www.example.com" class="button_to"><div><input data-confirm="Are you sure?" type="submit" value="Hello" /></div></form>},
-        button_to("Hello", "http://www.example.com", confirm: "Are you sure?")
-      )
-    end
-  end
-
   def test_button_to_with_javascript_disable_with
     assert_dom_equal(
       %{<form method="post" action="http://www.example.com" class="button_to"><div><input data-disable-with="Greeting..." type="submit" value="Hello" /></div></form>},
@@ -109,15 +100,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_button_to_with_javascript_deprecated_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.1. Use 'data: { disable_with: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<form method="post" action="http://www.example.com" class="button_to"><div><input data-disable-with="Greeting..." type="submit" value="Hello" /></div></form>},
-        button_to("Hello", "http://www.example.com", disable_with: "Greeting...")
-      )
-    end
-  end
-
   def test_button_to_with_remote_and_form_options
     assert_dom_equal(
       %{<form method="post" action="http://www.example.com" class="custom-class" data-remote="true" data-type="json"><div><input type="submit" value="Hello" /></div></form>},
@@ -132,15 +114,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_button_to_with_remote_and_javascript_with_deprecated_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<form method="post" action="http://www.example.com" class="button_to" data-remote="true"><div><input data-confirm="Are you sure?" type="submit" value="Hello" /></div></form>},
-        button_to("Hello", "http://www.example.com", remote: true, confirm: "Are you sure?")
-      )
-    end
-  end
-
   def test_button_to_with_remote_and_javascript_disable_with
     assert_dom_equal(
       %{<form method="post" action="http://www.example.com" class="button_to" data-remote="true"><div><input data-disable-with="Greeting..." type="submit" value="Hello" /></div></form>},
@@ -148,15 +121,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_button_to_with_remote_and_javascript_deprecated_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.1. Use 'data: { disable_with: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<form method="post" action="http://www.example.com" class="button_to" data-remote="true"><div><input data-disable-with="Greeting..." type="submit" value="Hello" /></div></form>},
-        button_to("Hello", "http://www.example.com", remote: true, disable_with: "Greeting...")
-      )
-    end
-  end
-
   def test_button_to_with_remote_false
     assert_dom_equal(
       %{<form method="post" action="http://www.example.com" class="button_to"><div><input type="submit" value="Hello" /></div></form>},
@@ -265,27 +229,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_link_tag_with_deprecated_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<a href="http://www.example.com" data-confirm="Are you sure?">Hello</a>},
-        link_to("Hello", "http://www.example.com", confirm: "Are you sure?")
-      )
-    end
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<a href="http://www.example.com" data-confirm="You cant possibly be sure, can you?">Hello</a>},
-        link_to("Hello", "http://www.example.com", confirm: "You cant possibly be sure, can you?")
-      )
-    end
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<a href="http://www.example.com" data-confirm="You cant possibly be sure,\n can you?">Hello</a>},
-        link_to("Hello", "http://www.example.com", confirm: "You cant possibly be sure,\n can you?")
-      )
-    end
-  end
-
   def test_link_to_with_remote
     assert_dom_equal(
       %{<a href="http://www.example.com" data-remote="true">Hello</a>},
@@ -349,15 +292,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_link_tag_using_post_javascript_and_with_deprecated_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<a href="http://www.example.com" data-method="post" rel="nofollow" data-confirm="Are you serious?">Hello</a>},
-        link_to("Hello", "http://www.example.com", method: :post, confirm: "Are you serious?")
-      )
-    end
-  end
-
   def test_link_tag_using_delete_javascript_and_href_and_confirm
     assert_dom_equal(
       %{<a href="\#" rel="nofollow" data-confirm="Are you serious?" data-method="delete">Destroy</a>},
@@ -365,15 +299,6 @@ class UrlHelperTest < ActiveSupport::TestCase
     )
   end
 
-  def test_link_tag_using_delete_javascript_and_href_and_with_deprecated_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.1. Use 'data: { confirm: \'Text\' }' instead" do
-      assert_dom_equal(
-        %{<a href="\#" rel="nofollow" data-confirm="Are you serious?" data-method="delete">Destroy</a>},
-        link_to("Destroy", "http://www.example.com", method: :delete, href: '#', confirm: "Are you serious?")
-      )
-    end
-  end
-
   def test_link_tag_with_block
     assert_dom_equal %{<a href="/"><span>Example site</span></a>},
       link_to('/') { content_tag(:span, 'Example site') }