do not pass include_blank as select attribute, fixes #1646

padrino · Apr 5, 2014 · e57e26e · e57e26e
1 parent 6285725
commit e57e26e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/padrino-helpers/lib/padrino-helpers/form_helpers/options.rb b/padrino-helpers/lib/padrino-helpers/form_helpers/options.rb
@@ -12,7 +12,7 @@ def extract_option_tags!(options)
           else
             options_for_select(extract_option_items!(options), state)
           end
-          if prompt = options[:include_blank]
+          if prompt = options.delete(:include_blank)
             option_tags.unshift(blank_option(prompt))
           end
           option_tags

diff --git a/padrino-helpers/test/test_form_helpers.rb b/padrino-helpers/test/test_form_helpers.rb
@@ -657,6 +657,13 @@ def protect_from_csrf; false; end
       assert_has_tag('select option:first-child', :value => "", :content => "") { actual_html }
     end
 
+    it 'should include blank as caption' do
+      opts = { "Red"  => ["Rose","Fire"], "Blue" => ["Sky","Sea"] }
+      actual_html = select_tag( 'color', :grouped_options => opts, :include_blank => 'Choose your destiny' )
+      assert_has_tag('select option:first-child', :value => "", :content => "Choose your destiny") { actual_html }
+      assert_has_no_tag('select[include_blank]') { actual_html }
+    end
+
     it 'should display select tag with grouped options for a nested array' do
       opts = [
         ["Friends",["Yoda",["Obiwan",2]]],