mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix stringify_keys destructive behavior for most FormTagHelper functions 

add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355
This commit is contained in:
Waynn Lue 2011-07-29 17:43:05 -07:00 committed by Xavier Noria
parent 66e114cd0c
commit 68c4b66015
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actionpack/lib/action_view/helpers/form_tag_helper.rb
View File

@ -304,7 +304,7 @@ module ActionView
# text_area_tag 'comment', nil, :class => 'comment_input' # text_area_tag 'comment', nil, :class => 'comment_input'
# # => <textarea class="comment_input" id="comment" name="comment"></textarea> # # => <textarea class="comment_input" id="comment" name="comment"></textarea>
def text_area_tag(name, content = nil, options = {}) def text_area_tag(name, content = nil, options = {})
options.stringify_keys! options = options.stringify_keys
if size = options.delete("size") if size = options.delete("size")
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split) options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
@ -407,7 +407,7 @@ module ActionView
# data-confirm="Are you sure?" /> # data-confirm="Are you sure?" />
# #
def submit_tag(value = "Save changes", options = {}) def submit_tag(value = "Save changes", options = {})
options.stringify_keys! options = options.stringify_keys
if disable_with = options.delete("disable_with") if disable_with = options.delete("disable_with")
options["data-disable-with"] = disable_with options["data-disable-with"] = disable_with
@ -458,7 +458,7 @@ module ActionView
def button_tag(content_or_options = nil, options = nil, &block) def button_tag(content_or_options = nil, options = nil, &block)
options = content_or_options if block_given? && content_or_options.is_a?(Hash) options = content_or_options if block_given? && content_or_options.is_a?(Hash)
options ||= {} options ||= {}
options.stringify_keys! options = options.stringify_keys
if disable_with = options.delete("disable_with") if disable_with = options.delete("disable_with")
options["data-disable-with"] = disable_with options["data-disable-with"] = disable_with
@ -497,7 +497,7 @@ module ActionView
# image_submit_tag("agree.png", :disabled => true, :class => "agree_disagree_button") # image_submit_tag("agree.png", :disabled => true, :class => "agree_disagree_button")
# # => <input class="agree_disagree_button" disabled="disabled" src="/images/agree.png" type="image" /> # # => <input class="agree_disagree_button" disabled="disabled" src="/images/agree.png" type="image" />
def image_submit_tag(source, options = {}) def image_submit_tag(source, options = {})
options.stringify_keys! options = options.stringify_keys
if confirm = options.delete("confirm") if confirm = options.delete("confirm")
options["data-confirm"] = confirm options["data-confirm"] = confirm

24
actionpack/test/template/form_tag_helper_test.rb
View File

@ -505,6 +505,30 @@ class FormTagHelperTest < ActionView::TestCase
expected = %(<fieldset class="format">Hello world!</fieldset>) expected = %(<fieldset class="format">Hello world!</fieldset>)
assert_dom_equal expected, output_buffer assert_dom_equal expected, output_buffer
end end
def test_text_area_tag_options_symbolize_keys_side_effects
options = { :option => "random_option" }
actual = text_area_tag "body", "hello world", options
assert_equal options, { :option => "random_option" }
end
def test_submit_tag_options_symbolize_keys_side_effects
options = { :option => "random_option" }
actual = submit_tag "submit value", options
assert_equal options, { :option => "random_option" }
end
def test_button_tag_options_symbolize_keys_side_effects
options = { :option => "random_option" }
actual = button_tag "button value", options
assert_equal options, { :option => "random_option" }
end
def test_image_submit_tag_options_symbolize_keys_side_effects
options = { :option => "random_option" }
actual = image_submit_tag "submit source", options
assert_equal options, { :option => "random_option" }
end
def protect_against_forgery? def protect_against_forgery?
false false