kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #21661 from akshay-vishnoi/submit_tag_tests

Browse source 
Fix - Prevent adding of `data-disable-with` option twice in html.
This commit is contained in:
Rafael Mendonça França 2015-09-29 02:05:07 -03:00
commit 0131c70175
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionview/lib/action_view/helpers/form_tag_helper.rb
View file

@ -450,9 +450,9 @@ module ActionView
disable_with_text ||= value.clone
tag_options.deep_merge!("data" => { "disable_with" => disable_with_text })
else
tag_options.delete("data-disable-with")
tag_options["data"].delete(:disable_with) if tag_options["data"]
end
tag_options.delete("data-disable-with")
end
tag :input, tag_options

8
actionview/test/template/form_tag_helper_test.rb
View file

@ -485,6 +485,14 @@ class FormTagHelperTest < ActionView::TestCase
)
end
def test_submit_tag_doesnt_have_data_disable_with_twice
assert_equal(
%(<input type="submit" name="commit" value="Save" data-confirm="Are you sure?" data-disable-with="Processing..." />),
submit_tag("Save", { "data-disable-with" => "Processing...", "data-confirm" => "Are you sure?" })
)
end
def test_button_tag
assert_dom_equal(
%(<button name="button" type="submit">Button</button>),