Merge pull request #10814 from kennyj/deprecations_4_1

Remove some deprecation methods / options / files.

6 files changed, 3 insertions, 215 deletions

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') }