[padrino-helpers] Fixes options_for_select helper selected logic and …

…added test
mcmire · Jul 12, 2010 · 80d499b · 80d499b
1 parent 44967af
commit 80d499b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/padrino-helpers/lib/padrino-helpers/form_helpers.rb b/padrino-helpers/lib/padrino-helpers/form_helpers.rb
@@ -357,7 +357,7 @@ def options_for_select(option_items, selected_value=nil)
         return '' if option_items.blank?
         option_items.collect do |caption, value|
           value ||= caption
-          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
+          content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /^(#{value}|#{caption})$/)
         end
       end
 

diff --git a/padrino-helpers/test/test_form_helpers.rb b/padrino-helpers/test/test_form_helpers.rb
@@ -351,6 +351,14 @@ def app
       assert_has_tag('select option', :content => 'Blue', :value => 'blue1') { actual_html }
       assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
     end
+
+    should "display options selected only for exact match" do
+      options = [['One', '1'], ['1', '10'], ['Two', "-1"]]
+      actual_html = select_tag(:range, :options => options, :selected => '-1')
+      assert_has_tag(:select, :name => 'range') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Two', :value => '-1', :selected => 'selected') { actual_html }
+    end
 
     should "display select tag in erb" do
       visit '/erb/form_tag'