@@ -255,13 +255,11 @@ module JustinFrench #:nodoc: # f.input :author_id, :as => :select, :label_method => :label def select_input(method, options) options[:collection] ||= find_parent_objects_for_column(method) - options[:include_blank] ||= false - options[:prompt] ||= nil choices = options[:collection].map { |o| collection_option(o, options[:label_method] || :to_label) } - input_label(method, options) + template.select(@object_name, method, choices, {:include_blank => options[:include_blank], :prompt => options[:prompt]}) + input_label(method, options) + template.select(@object_name, method, choices, options) end # Outputs a fieldset containing a legend for the label text, and an ordered list (ol) of list @@ -438,7 +436,7 @@ module JustinFrench #:nodoc: else list_items_capture << template.content_tag(:li, template.content_tag(:label, input.to_s.humanize, :for => "#{@object_name}_#{method}_#{position[input]}i") + - template.send("select_#{input}".intern, @object.send(method), :prefix => @object_name, :field_name => "#{method}(#{position[input]}i)") + template.send("select_#{input}".intern, @object.send(method), :prefix => @object_name, :field_name => "#{method}(#{position[input]}i)", :include_blank => options[:include_blank]) ) end end @@ -483,7 +481,7 @@ module JustinFrench #:nodoc: options[:false] ||= "No" choices = [ [options[:true],true], [options[:false],false] ] - input_label(method, options) + template.select(@object_name, method, choices) + input_label(method, options) + template.select(@object_name, method, choices, options) end # Outputs a fieldset containing two radio buttons (with labels) for "true" and "false". The lib/justin_french/formtastic.rb @@ -718,22 +718,23 @@ describe 'Formtastic' do end end - - end - describe ':as => :select, :include_blank => true, :prompt => "choose something"' do - before do - semantic_form_for(@new_post) do |builder| - concat(builder.input(:author_id, :as => :select, :include_blank => true, :prompt => "choose author")) + describe 'when :include_blank => true, :prompt => "choose something" is set' do + before do + semantic_form_for(@new_post) do |builder| + concat(builder.input(:author_id, :as => :select, :include_blank => true, :prompt => "choose author")) + end + end + + it 'should have a blank select option' do + output_buffer.should have_tag("form li select option[@value='']", / /) + end + + it 'should have a select with prompt' do + output_buffer.should have_tag("form li select option[@value='']", /choose author/) end end - it 'should have a blank select option' do - output_buffer.should have_tag("form li select option[@value='']", / /) - end - it 'should have a select with prompt' do - output_buffer.should have_tag("form li select option[@value='']", /choose author/) - end end end @@ -859,6 +860,17 @@ describe 'Formtastic' do output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3) end + describe 'when :include_blank => true is set' do + before do + semantic_form_for(@new_post) do |builder| + concat(builder.input(:publish_at, :as => :date, :include_blank => true)) + end + end + + it 'should have a blank select option' do + output_buffer.should have_tag("option[@value='']", "") + end + end end @@ -902,6 +914,18 @@ describe 'Formtastic' do it 'should have five selects for year, month, day, hour and minute' do output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5) end + + describe 'when :include_blank => true is set' do + before do + semantic_form_for(@new_post) do |builder| + concat(builder.input(:publish_at, :as => :datetime, :include_blank => true)) + end + end + + it 'should have a blank select option' do + output_buffer.should have_tag("option[@value='']", "") + end + end end @@ -943,6 +967,18 @@ describe 'Formtastic' do output_buffer.should have_tag('form li.time fieldset ol li select', :count => 2) end + describe 'when :include_blank => true is set' do + before do + semantic_form_for(@new_post) do |builder| + concat(builder.input(:publish_at, :as => :time, :include_blank => true)) + end + end + + it 'should have a blank select option' do + output_buffer.should have_tag("option[@value='']", "") + end + end + end describe ':as => :boolean' do @@ -1147,10 +1183,25 @@ describe 'Formtastic' do output_buffer.should have_tag('form li select#post_allow_comments option[@value="false"]', /No/) end - end + end + + describe 'when :include_blank => true, :prompt => "choose something" is set' do + before do + semantic_form_for(@new_post) do |builder| + concat(builder.input(:allow_comments, :as => :boolean_select, :include_blank => true, :prompt => "choose something")) + end + end + it 'should have a blank select option' do + output_buffer.should have_tag("form li select option[@value='']", / /) + end + it 'should have a select with prompt' do + output_buffer.should have_tag("form li select option[@value='']", /choose something/) + end + end + end - + describe ':as => :numeric' do setup do spec/formtastic_spec.rb b85e806dcc370d6f44a3e7c664e1e4bf0deef312 Negonicrac negonicrac@gmail.com http://github.com/freelancing-god/formtastic/commit/3ca56c21ac6bb2ec3d41a6080984deda5e41853e 3ca56c21ac6bb2ec3d41a6080984deda5e41853e 2009-01-05T08:15:24-08:00 2009-01-05T08:15:24-08:00 added :input_blank => true supprot to date, time, datetime and boolean_select c11f90ded57f9e74e29a4f72efadc735ce76c0ff Negonicrac negonicrac@gmail.com