mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix select_tag so that is doesn't change options when include_blank is set
This commit is contained in:
parent
a2708473b1
commit
a4229a534f
3 changed files with 12 additions and 1 deletions
|
@ -1,3 +1,6 @@
|
|||
* Fix `select_tag` so that it doesn't change `options` when `include_blank` is present.
|
||||
|
||||
*Younes SERRAJ*
|
||||
|
||||
|
||||
Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionview/CHANGELOG.md) for previous changes.
|
||||
|
|
|
@ -137,7 +137,8 @@ module ActionView
|
|||
html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
|
||||
|
||||
if options.include?(:include_blank)
|
||||
include_blank = options.delete(:include_blank)
|
||||
include_blank = options[:include_blank]
|
||||
options = options.except(:include_blank)
|
||||
options_for_blank_options_tag = { value: "" }
|
||||
|
||||
if include_blank == true
|
||||
|
|
|
@ -301,6 +301,13 @@ class FormTagHelperTest < ActionView::TestCase
|
|||
assert_dom_equal expected, actual
|
||||
end
|
||||
|
||||
def test_select_tag_with_include_blank_doesnt_change_options
|
||||
options = { include_blank: true, prompt: "string" }
|
||||
expected_options = options.dup
|
||||
select_tag "places", raw("<option>Home</option><option>Work</option><option>Pub</option>"), options
|
||||
expected_options.each { |k, v| assert_equal v, options[k] }
|
||||
end
|
||||
|
||||
def test_select_tag_with_include_blank_false
|
||||
actual = select_tag "places", raw("<option>Home</option><option>Work</option><option>Pub</option>"), include_blank: false
|
||||
expected = %(<select id="places" name="places"><option>Home</option><option>Work</option><option>Pub</option></select>)
|
||||
|
|
Loading…
Reference in a new issue