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.

1 files changed, 8 insertions, 8 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