Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers

Deprecate link_to_function and button_to_function

1 files changed, 24 insertions, 12 deletions

diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 4b9c3c97b1..91968861fa 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -46,33 +46,45 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_button_to_function
-    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
-      button_to_function("Greeting", "alert('Hello world!')")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
+        button_to_function("Greeting", "alert('Hello world!')")
+    end
   end
 
   def test_button_to_function_with_onclick
-    assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
-      button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" 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_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
-      button_to_function("Greeting")
+    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
+        button_to_function("Greeting")
+    end
   end
 
   def test_link_to_function
-    assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')")
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')")
+    end
   end
 
   def test_link_to_function_with_existing_onclick
-    assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
+    end
   end
 
   def test_function_with_href
-    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
-      link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
+    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
+      assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
+        link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
+    end
   end
 
   def test_javascript_tag