diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 15:59:39 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-01 16:00:47 -0300 |
commit | f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f (patch) | |
tree | ad7719ffd839cdccfea727cca977eeb3f1781d8d /actionpack/test | |
parent | e826a5c749f9a4029a3b2a7e3d371498feeb9b10 (diff) | |
download | rails-f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f.tar.gz rails-f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f.tar.bz2 rails-f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f.zip |
Revert "Deprecate link_to_function and button_to_function helpers"
This reverts commit 9dc57fe9c4807fc0ad4b1590a931891d9faa3164.
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/template/javascript_helper_test.rb | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb index 91968861fa..4b9c3c97b1 100644 --- a/actionpack/test/template/javascript_helper_test.rb +++ b/actionpack/test/template/javascript_helper_test.rb @@ -46,45 +46,33 @@ class JavaScriptHelperTest < ActionView::TestCase end def test_button_to_function - 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 + assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />), + button_to_function("Greeting", "alert('Hello world!')") end def test_button_to_function_with_onclick - 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 + 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 def test_button_to_function_without_function - 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 + assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />", + button_to_function("Greeting") end def test_link_to_function - 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 + assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>), + link_to_function("Greeting", "alert('Hello world!')") end def test_link_to_function_with_existing_onclick - 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 + 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 def test_function_with_href - 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 + 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 def test_javascript_tag |