properly fix the test in #1882

padrino · Oct 12, 2015 · 2783092 · 2783092
1 parent 7baf2ca
commit 2783092
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/padrino-helpers/lib/padrino-helpers/form_helpers/options.rb b/padrino-helpers/lib/padrino-helpers/form_helpers/options.rb
@@ -57,9 +57,9 @@ def option_is_selected?(value, caption, selected_values)
         def options_for_select(option_items, state = {})
           return [] if option_items.blank?
           option_items.map do |caption, value, attributes|
-            html_attributes = { :value => value ||= caption }.merge(attributes||{})
-            html_attributes[:selected] ||= option_is_selected?(value, caption, state[:selected])
-            html_attributes[:disabled] ||= option_is_selected?(value, caption, state[:disabled])
+            html_attributes = { :value => value || caption }.merge(attributes||{})
+            html_attributes[:selected] ||= option_is_selected?(html_attributes[:value], caption, state[:selected])
+            html_attributes[:disabled] ||= option_is_selected?(html_attributes[:value], caption, state[:disabled])
             content_tag(:option, caption, html_attributes)
           end
         end

diff --git a/padrino-helpers/test/test_form_helpers.rb b/padrino-helpers/test/test_form_helpers.rb
@@ -781,8 +781,8 @@ def protect_from_csrf; false; end
     end
 
     it 'should display selected options falling back to checking content' do
-      options = [['one'], ['two'], ['three', 'three']]
-      actual_html = select_tag(:number, :options => options, :selected => 'one').gsub!(/value="(one|two)"/, '').html_safe
+      options = [['one', nil, :value => nil], ['two', nil, :value => nil], ['three', 'three']]
+      actual_html = select_tag(:number, :options => options, :selected => 'one')
       assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
       assert_has_tag('select option', :content => 'one', :selected => 'selected') { actual_html }
     end