Revert "Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` option"

Revert "Deprecate `:disable_with` in favor of `'data-disable-with'` option for `button_to` and `submit_tag` helpers."

This reverts commit fc092a9cba5fceec38358072e50e09250cf58840.
This reverts commit e9051e20aeb2c666db06b6217954737665878db7.
This reverts commit d47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1.
This reverts commit 21141e777bdce8534e3755c8de7268324b3d8714.

3 files changed, 52 insertions, 149 deletions

diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index a9fa2298b7..b0c62f4911 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -442,14 +442,14 @@ class AssetTagHelperTest < ActionView::TestCase
   end
 
   def test_image_tag_with_mouseover
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(
         %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
         image_tag("mouse.png", :mouseover => "/images/mouse_over.png")
       )
     end
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(
         %(<img alt="Mouse" onmouseover="this.src='/images/mouse_over.png'" onmouseout="this.src='/images/mouse.png'" src="/images/mouse.png" />),
         image_tag("mouse.png", :mouseover => image_path("mouse_over.png"))
@@ -1120,11 +1120,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(/collaboration/hieraki/images/xml.png), image_path("xml.png"))
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse.png'" src="/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     end
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='/collaboration/hieraki/images/mouse2.png'" src="/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
     end
   end
@@ -1140,11 +1140,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     end
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
     end
   end
@@ -1156,11 +1156,11 @@ class AssetTagHelperNonVhostTest < ActionView::TestCase
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/stylesheets/style.css), stylesheet_path("style"))
     assert_dom_equal(%(gopher://assets.example.com/collaboration/hieraki/images/xml.png), image_path("xml.png"))
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse.png" />), image_tag("mouse.png", :mouseover => "/images/mouse_over.png"))
     end
 
-    assert_deprecated ":mouseover option is deprecated and will be removed from Rails 4.0" do
+    assert_deprecated ":mouseover options is deprecated and will be removed from Rails 4.0" do
       assert_dom_equal(%(<img alt="Mouse2" onmouseover="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse_over2.png'" onmouseout="this.src='gopher://assets.example.com/collaboration/hieraki/images/mouse2.png'" src="gopher://assets.example.com/collaboration/hieraki/images/mouse2.png" />), image_tag("mouse2.png", :mouseover => image_path("mouse_over2.png")))
     end
   end
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index c0f300884a..dcc6dd0411 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -367,46 +367,31 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_submit_tag
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead" do
-      assert_dom_equal(
-        %(<input name='commit' data-disable-with="Saving..." onclick="alert('hello!')" type="submit" value="Save" />),
-        submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
-      )
-    end
+    assert_dom_equal(
+      %(<input name='commit' data-disable-with="Saving..." onclick="alert('hello!')" type="submit" value="Save" />),
+      submit_tag("Save", :disable_with => "Saving...", :onclick => "alert('hello!')")
+    )
   end
 
   def test_submit_tag_with_no_onclick_options
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead" do
-      assert_dom_equal(
-        %(<input name='commit' data-disable-with="Saving..." type="submit" value="Save" />),
-        submit_tag("Save", :disable_with => "Saving...")
-      )
-    end
+    assert_dom_equal(
+      %(<input name='commit' data-disable-with="Saving..." type="submit" value="Save" />),
+      submit_tag("Save", :disable_with => "Saving...")
+    )
   end
 
   def test_submit_tag_with_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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_submit_tag_with_confirmation_without_deprecation_warning
     assert_dom_equal(
       %(<input name='commit' type='submit' value='Save' data-confirm="Are you sure?" />),
-      submit_tag("Save", :data => { :confirm => "Are you sure?" })
+      submit_tag("Save", :confirm => "Are you sure?")
     )
   end
 
   def test_submit_tag_with_confirmation_and_with_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead" do
-      assert_dom_equal(
-        %(<input name="commit" data-disable-with="Saving..." data-confirm="Are you sure?" type="submit" value="Save" />),
-        submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?")
-      )
-    end
+    assert_dom_equal(
+      %(<input name="commit" data-disable-with="Saving..." data-confirm="Are you sure?" type="submit" value="Save" />),
+      submit_tag("Save", :disable_with => "Saving...", :confirm => "Are you sure?")
+    )
   end
 
   def test_button_tag
@@ -430,31 +415,6 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
-  def test_button_tag_with_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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_button_tag_with_confirmation_without_deprecation_warning
-    assert_dom_equal(
-      %(<button name="button" type="submit" data-confirm="Are you sure?">Save</button>),
-      button_tag("Save", :type => "submit", :data => { :confirm => "Are you sure?" })
-    )
-  end
-
-  def test_button_tag_with_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead" do
-      assert_dom_equal(
-        %(<button name="button" data-disable-with="Saving..." type="submit">Save</button>),
-        button_tag("Save", :type => "submit", :disable_with => "Saving...")
-      )
-    end
-  end
-
   def test_button_tag_with_reset_type
     assert_dom_equal(
       %(<button name="button" type="reset">Reset</button>),
@@ -486,18 +446,9 @@ class FormTagHelperTest < ActionView::TestCase
   end
 
   def test_image_submit_tag_with_confirmation
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead" do
-      assert_dom_equal(
-        %(<input type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
-        image_submit_tag("save.gif", :confirm => "Are you sure?")
-      )
-    end
-  end
-
-  def test_image_submit_tag_with_confirmation_without_deprecation_warning
     assert_dom_equal(
       %(<input type="image" src="/images/save.gif" data-confirm="Are you sure?" />),
-      image_submit_tag("save.gif", :data => { :confirm => "Are you sure?" })
+      image_submit_tag("save.gif", :confirm => "Are you sure?")
     )
   end
 
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 95f3b33bcf..f0e33404af 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -75,56 +75,40 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_button_to_with_javascript_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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_confirm_without_deprecation_warning
     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", :data => { :confirm => "Are you sure?" })
+      button_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
     )
   end
 
   def test_button_to_with_javascript_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' 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
+    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
 
   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>", button_to("Hello", "http://www.example.com", :remote => true, :form => { :class => "custom-class", "data-type" => "json" } )
   end
-
-  def test_button_to_with_remote_and_javascript_disable_with
-    assert_deprecated ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' 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_and_javascript_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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
+    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
+  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>",
+      button_to("Hello", "http://www.example.com", :remote => true, :disable_with => "Greeting...")
+    )
   end
 
-  def test_button_to_with_remote_and_javascript_confirm_without_deprecation_warning
+  def test_button_to_with_remote_and_javascript_confirm_and_javascript_disable_with
     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, :data => { :confirm => "Are you sure?" })
+      "<form method=\"post\" action=\"http://www.example.com\" class=\"button_to\" data-remote=\"true\"><div><input data-disable-with=\"Greeting...\" data-confirm=\"Are you sure?\" type=\"submit\" value=\"Hello\" /></div></form>",
+      button_to("Hello", "http://www.example.com", :remote => true, :confirm => "Are you sure?", :disable_with => "Greeting...")
     )
   end
 
@@ -215,30 +199,17 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_with_javascript_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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.0. Use ':data => { :confirm => \'Text\' }' instead" do
-      assert_dom_equal(
-        "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure, can you?\">Hello</a>",
-        link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure, can you?")
-      )
-    end
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. Use ':data => { :confirm => \'Text\' }' instead" do
-      assert_dom_equal(
-        "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure,\n can you?\">Hello</a>",
-        link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure,\n can you?")
-      )
-    end
-  end
-
-  def test_link_tag_confirm_without_deprecation_warning
     assert_dom_equal(
       "<a href=\"http://www.example.com\" data-confirm=\"Are you sure?\">Hello</a>",
-      link_to("Hello", "http://www.example.com", :data => { :confirm => "Are you sure?" })
+      link_to("Hello", "http://www.example.com", :confirm => "Are you sure?")
+    )
+    assert_dom_equal(
+      "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure, can you?\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure, can you?")
+    )
+    assert_dom_equal(
+      "<a href=\"http://www.example.com\" data-confirm=\"You can't possibly be sure,\n can you?\">Hello</a>",
+      link_to("Hello", "http://www.example.com", :confirm => "You can't possibly be sure,\n can you?")
     )
   end
 
@@ -285,35 +256,16 @@ class UrlHelperTest < ActiveSupport::TestCase
   end
 
   def test_link_tag_using_post_javascript_and_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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_post_javascript_and_confirm_without_deprecation_warning
     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, :data => { :confirm => "Are you serious?" })
+      link_to("Hello", "http://www.example.com", :method => :post, :confirm => "Are you serious?")
     )
   end
 
   def test_link_tag_using_delete_javascript_and_href_and_confirm
-    assert_deprecated ":confirm option is deprecated and will be removed from Rails 4.0. 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?"),
-        "When specifying url, form should be generated with it, but not this.href"
-      )
-    end
-  end
-
-  def test_link_tag_using_delete_javascript_and_href_and_confirm_without_deprecation_warning
     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 => '#', :data => { :confirm => "Are you serious?" }),
+      link_to("Destroy", "http://www.example.com", :method => :delete, :href => '#', :confirm => "Are you serious?"),
       "When specifying url, form should be generated with it, but not this.href"
     )
   end