aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-25 16:14:28 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-10-25 16:20:41 -0700
commitb2278aa1a0c02f8793587f625900504b447b4517 (patch)
treeb517e6ae30c683351b6f47b103f9c5b911231209 /actionview
parentf28340a5ef3dafd3f96e7032b6b21352ebd11f57 (diff)
downloadrails-b2278aa1a0c02f8793587f625900504b447b4517.tar.gz
rails-b2278aa1a0c02f8793587f625900504b447b4517.tar.bz2
rails-b2278aa1a0c02f8793587f625900504b447b4517.zip
Use new hash syntax
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/form_tag_helper.rb5
-rw-r--r--actionview/test/template/form_tag_helper_test.rb2
2 files changed, 4 insertions, 3 deletions
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb
index 5aeb138f7a..c0218fd55d 100644
--- a/actionview/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/form_tag_helper.rb
@@ -135,15 +135,16 @@ module ActionView
if options.include?(:include_blank)
include_blank = options.delete(:include_blank)
+
if include_blank == true
include_blank = ''
end
- option_tags = content_tag(:option, include_blank, :value => '').safe_concat(option_tags)
+ option_tags = content_tag(:option, include_blank, value: '').safe_concat(option_tags)
end
if prompt = options.delete(:prompt)
- option_tags = content_tag(:option, prompt, :value => '').safe_concat(option_tags)
+ option_tags = content_tag(:option, prompt, value: '').safe_concat(option_tags)
end
content_tag :select, option_tags, { "name" => html_name, "id" => sanitize_to_id(name) }.update(options.stringify_keys)
diff --git a/actionview/test/template/form_tag_helper_test.rb b/actionview/test/template/form_tag_helper_test.rb
index e8170d43e1..f8fd642809 100644
--- a/actionview/test/template/form_tag_helper_test.rb
+++ b/actionview/test/template/form_tag_helper_test.rb
@@ -233,7 +233,7 @@ class FormTagHelperTest < ActionView::TestCase
end
def test_select_tag_with_include_blank_string
- actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, :include_blank => 'Choose'
+ actual = select_tag "places", "<option>Home</option><option>Work</option><option>Pub</option>".html_safe, include_blank: 'Choose'
expected = %(<select id="places" name="places"><option value="">Choose</option><option>Home</option><option>Work</option><option>Pub</option></select>)
assert_dom_equal expected, actual
end