diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-12-24 08:02:57 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-12-24 08:04:25 +0900 |
| commit | 621ed494f573c4e37c1f7d37cc8741cc4c502827 (patch) | |
| tree | 90939705e553792f6503862babd39ffe8786eb01 /actionview | |
| parent | 552e4e6b9e3d6ae7a911aa496422c6c598813d5d (diff) | |
| download | rails-621ed494f573c4e37c1f7d37cc8741cc4c502827.tar.gz rails-621ed494f573c4e37c1f7d37cc8741cc4c502827.tar.bz2 rails-621ed494f573c4e37c1f7d37cc8741cc4c502827.zip | |
fix TypeError when using submit_tag with Symbol value
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/form_tag_helper.rb | 2 | ||||
| -rw-r--r-- | actionview/test/template/form_tag_helper_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb index 0191064326..79a1a242bf 100644 --- a/actionview/lib/action_view/helpers/form_tag_helper.rb +++ b/actionview/lib/action_view/helpers/form_tag_helper.rb @@ -447,7 +447,7 @@ module ActionView unless tag_options["data-disable-with"] == false || (tag_options["data"] && tag_options["data"][:disable_with] == false) disable_with_text = tag_options["data-disable-with"] disable_with_text ||= tag_options["data"][:disable_with] if tag_options["data"] - disable_with_text ||= value.clone + disable_with_text ||= value.to_s.clone tag_options.deep_merge!("data" => { "disable_with" => disable_with_text }) else tag_options["data"].delete(:disable_with) if tag_options["data"] diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb index de1eb89dc5..359ecbc637 100644 --- a/actionview/test/template/form_tag_helper_test.rb +++ b/actionview/test/template/form_tag_helper_test.rb @@ -510,6 +510,13 @@ class FormTagHelperTest < ActionView::TestCase ) end + def test_submit_tag_with_symbol_value + assert_dom_equal( + %(<input data-disable-with="Save" name='commit' type="submit" value="Save" />), + submit_tag(:Save) + ) + end + def test_button_tag assert_dom_equal( |