formtastic-rails3 0.9.7 → 0.9.10.0

data/spec/inputs/boolean_input_spec.rb

@@ -6,19 +6,20 @@ describe 'boolean input' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
   end
-    
+   
   it_should_have_input_wrapper_with_class("boolean")
   it_should_have_input_wrapper_with_id("post_allow_comments_input")
   it_should_apply_error_logic_for_input_type(:boolean)
 
   it 'should generate a label containing the input' do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label', :count => 1)
     output_buffer.should have_tag('form li label[@for="post_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
@@ -26,6 +27,7 @@ describe 'boolean input' do
   end
 
   it 'should generate a checkbox input' do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input')
     output_buffer.should have_tag('form li label input#post_allow_comments')
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -34,19 +36,22 @@ describe 'boolean input' do
   end
 
   it 'should allow checked and unchecked values to be sent' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end
 
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form li label input[@type="checkbox"][@value="checked"]')
     output_buffer.should have_tag('form li label input[@type="hidden"][@value="unchecked"]')
   end
 
   it 'should generate a label and a checkbox even if no object is given' do
-    semantic_form_for(:project, :url => 'http://test.host') do |builder|
+    form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end
 
+    output_buffer.concat(form) if Formtastic::Util.rails3?
+
     output_buffer.should have_tag('form li label[@for="project_allow_comments"]')
     output_buffer.should have_tag('form li label', /Allow comments/)
     output_buffer.should have_tag('form li label input[@type="checkbox"]')
@@ -58,19 +63,22 @@ describe 'boolean input' do
 
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     describe "not selected" do
       before do
         @new_post.stub!(:allow_comments).and_return(true)
 
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:allow_comments, :as => :boolean, :selected => false))
+          end
         end
       end
 
       it 'should not be selected' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end
@@ -78,13 +86,16 @@ describe 'boolean input' do
     describe "selected" do
       before do
         @new_post.stub!(:allow_comments).and_return(false)
-
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
+        
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:allow_comments, :as => :boolean, :selected => true))
+          end
         end
       end
 
       it 'should be selected' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label input[@type='checkbox'][@checked='checked']")
       end
     end

data/spec/inputs/check_boxes_input_spec.rb

@@ -7,10 +7,10 @@ describe 'check_boxes input' do
   
   describe 'for a has_many association' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
       mock_everything
       
-      semantic_form_for(@fred) do |builder|
+      @form = semantic_form_for(@fred) do |builder|
         concat(builder.input(:posts, :as => :check_boxes, :value_as_class => true))
       end
     end
@@ -23,31 +23,37 @@ describe 'check_boxes input' do
     it_should_use_the_collection_when_provided(:check_boxes, 'input[@type="checkbox"]')
     
     it 'should generate a legend containing a label with text for the input' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset legend.label label')
       output_buffer.should have_tag('form li fieldset legend.label label', /Posts/)
     end
     
     it 'should not link the label within the legend to any input' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should_not have_tag('form li fieldset legend label[@for^="author_post_ids_"]')
     end
     
 
     it 'should generate an ordered list with a list item for each choice' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol')
       output_buffer.should have_tag('form li fieldset ol li', :count => ::Post.find(:all).size)
     end
 
     it 'should have one option with a "checked" attribute' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li input[@checked]', :count => 1)
     end
 
     it 'should generate hidden inputs with default value blank' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li fieldset ol li label input[@type='hidden'][@value='']", :count => ::Post.find(:all).size)
     end
 
     describe "each choice" do
 
       it 'should contain a label for the radio input with a nested input and label text' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag('form li fieldset ol li label', /#{post.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='author_post_ids_#{post.id}']")
@@ -55,12 +61,14 @@ describe 'check_boxes input' do
       end
 
       it 'should use values as li.class when value_as_class is true' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li.post_#{post.id} label")
         end
       end
 
       it 'should have a checkbox input for each post' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Post.find(:all).each do |post|
           output_buffer.should have_tag("form li fieldset ol li label input#author_post_ids_#{post.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@name='author[post_ids][]']", :count => 2)
@@ -69,6 +77,7 @@ describe 'check_boxes input' do
 
       it "should mark input as checked if it's the the existing choice" do
         ::Post.find(:all).include?(@fred.posts.first).should be_true
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']")
       end
     end
@@ -76,20 +85,23 @@ describe 'check_boxes input' do
     describe 'and no object is given' do
       before(:each) do
         output_buffer.replace ''
-        semantic_form_for(:project, :url => 'http://test.host') do |builder|
+        @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :check_boxes, :collection => ::Author.find(:all)))
         end
       end
 
       it 'should generate a fieldset with legend' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset legend', /Author/)
       end
 
       it 'shold generate an li tag for each item in the collection' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li fieldset ol li', :count => ::Author.find(:all).size)
       end
 
       it 'should generate labels for each item' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag('form li fieldset ol li label', /#{author.to_label}/)
           output_buffer.should have_tag("form li fieldset ol li label[@for='project_author_id_#{author.id}']")
@@ -97,6 +109,7 @@ describe 'check_boxes input' do
       end
 
       it 'should generate inputs for each item' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         ::Author.find(:all).each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#project_author_id_#{author.id}")
           output_buffer.should have_tag("form li fieldset ol li label input[@type='checkbox']")
@@ -108,19 +121,22 @@ describe 'check_boxes input' do
 
     describe 'when :selected is set' do
       before do
-        @output_buffer = ActiveSupport::SafeBuffer.new
+        @output_buffer = ''
       end
 
       describe "no selected items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
+          with_deprecation_silenced do
+            @form = semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => nil))
+            end
           end
         end
 
         it 'should not have any selected item(s)' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li fieldset ol li label input[@checked='checked']")
         end
       end
@@ -129,12 +145,15 @@ describe 'check_boxes input' do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
 
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
+          with_deprecation_silenced do
+            @form = semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => @fred.id))
+            end
           end
         end
 
         it "should have one item selected; the specified one" do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 1)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@fred.id}']")
@@ -144,13 +163,16 @@ describe 'check_boxes input' do
       describe "multiple selected items" do
         before do
           @new_post.stub!(:author_ids).and_return(nil)
-
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
+          
+          with_deprecation_silenced do
+            @form = semantic_form_for(@new_post) do |builder|
+              concat(builder.input(:authors, :as => :check_boxes, :selected => [@bob.id, @fred.id]))
+            end
           end
         end
 
         it "should have multiple items selected; the specified ones" do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked']", :count => 2)
           output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
           output_buffer.should have_tag("form li fieldset ol li label input[@checked='checked'][@value='#{@bob.id}']")
@@ -160,8 +182,78 @@ describe 'check_boxes input' do
       end
 
     end
+    
+    it 'should warn about :selected deprecation' do
+      with_deprecation_silenced do
+        ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
+        semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:authors, :as => :check_boxes, :selected => @bob.id))
+        end
+      end
+    end
+    
+
+    describe 'when :disabled is set' do
+      before do
+        @output_buffer = ''
+      end
+
+      describe "no disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => nil))
+          end
+        end
+
+        it 'should not have any disabled item(s)' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.should_not have_tag("form li fieldset ol li label input[@disabled='disabled']")
+        end
+      end
+
+      describe "single disabled item" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => @fred.id))
+          end
+        end
+
+        it "should have one item disabled; the specified one" do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 1)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+      describe "multiple disabled items" do
+        before do
+          @new_post.stub!(:author_ids).and_return(nil)
+
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:authors, :as => :check_boxes, :disabled => [@bob.id, @fred.id]))
+          end
+        end
+
+        it "should have multiple items disabled; the specified ones" do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled']", :count => 2)
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@bob.id}']", /bob/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@bob.id}']")
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_ids_#{@fred.id}']", /fred/i)
+          output_buffer.should have_tag("form li fieldset ol li label input[@disabled='disabled'][@value='#{@fred.id}']")
+        end
+      end
+
+    end
 
   end
+  
+  
 
 end
 

data/spec/inputs/country_input_spec.rb

@@ -6,7 +6,7 @@ describe 'country input' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -25,8 +25,8 @@ describe 'country input' do
   describe "when country_select is available as a helper (from a plugin)" do
     
     before do
-      semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return(ActiveSupport::SafeBuffer.new("<select><option>...</option></select>"))
+      @form = semantic_form_for(@new_post) do |builder|
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
     end
@@ -38,12 +38,14 @@ describe 'country input' do
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
     end
     
@@ -54,8 +56,8 @@ describe 'country input' do
     it "should be passed down to the country_select helper when provided" do
       priority_countries = ["Foo", "Bah"]
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country, :priority_countries => priority_countries))
       end
@@ -67,14 +69,50 @@ describe 'country input' do
       priority_countries.should_not be_nil
       
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
-        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+        builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country))
       end
     end
     
   end
-
+  
+  describe "matching" do
+    
+    describe "when the attribute is 'country'" do
+      
+      before do
+        @form = semantic_form_for(@new_post) do |builder|
+          builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
+          concat(builder.input(:country))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag "form li.country"
+      end
+    end
+    
+    describe "whent the attribute is 'country_something'" do
+      
+      before do
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:country_subdivision))
+          concat(builder.input(:country_code))
+        end
+      end
+      
+      it "should render a country input" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag "form li.country"
+        output_buffer.should have_tag "form li.string", :count => 2
+      end
+      
+    end
+    
+  end
+  
 end
 

data/spec/inputs/date_input_spec.rb

@@ -6,98 +6,121 @@ describe 'date input' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
-    
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:publish_at, :as => :date))
-    end
-  end
-
-  it_should_have_input_wrapper_with_class("date")
-  it_should_have_input_wrapper_with_id("post_publish_at_input")
-  it_should_have_a_nested_fieldset
-  it_should_apply_error_logic_for_input_type(:date)
-  
-  it 'should have a legend and label with the label text inside the fieldset' do
-    output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
   end
   
-  it 'should associate the legend label with the first select' do
-    output_buffer.should have_tag('form li.date fieldset legend.label')
-    output_buffer.should have_tag('form li.date fieldset legend.label label')
-    output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
-    output_buffer.should have_tag('form li.date fieldset legend.label label[@for="post_publish_at_1i"]')
-  end
-
-  it 'should have an ordered list of three items inside the fieldset' do
-    output_buffer.should have_tag('form li.date fieldset ol')
-    output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
-  end
-
-  it 'should have three labels for year, month and day' do
-    output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
-    output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
-  end
+  describe "general" do
+    
+    before do
+      output_buffer.replace ''
+      @form = semantic_form_for(@new_post) do |builder|
+        concat(builder.input(:publish_at, :as => :date))
+      end
+    end
 
-  it 'should have three selects for year, month and day' do
-    output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
+    it_should_have_input_wrapper_with_class("date")
+    it_should_have_input_wrapper_with_id("post_publish_at_input")
+    it_should_have_a_nested_fieldset
+    it_should_apply_error_logic_for_input_type(:date)
+    
+    it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
+    end
+    
+    it 'should associate the legend label with the first select' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li.date fieldset legend.label')
+      output_buffer.should have_tag('form li.date fieldset legend.label label')
+      output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
+      output_buffer.should have_tag('form li.date fieldset legend.label label[@for="post_publish_at_1i"]')
+    end
+    
+    it 'should have an ordered list of three items inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li.date fieldset ol')
+      output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
+    end
+    
+    it 'should have three labels for year, month and day' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
+      output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
+    end
+    
+    it 'should have three selects for year, month and day' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
+      output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
+    end
   end
     
-  describe ':default option' do
+  describe ':selected option' do
     
     describe "when the object has a value" do
-      it "should select the object value (ignoring :default)" do
+      it "should select the object value (ignoring :selected)" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date, :default => Time.mktime(1999)))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
     end
     
-    describe 'when the object has no value' do
-      it "should select the :default if provided as a Date" do
+    describe 'when the object has no value (nil)' do
+      it "should select the :selected if provided as a Date" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date, :default => Date.new(1999)))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
       
-      it "should select the :default if provided as a Time" do
+      it "should select the :selected if provided as a Time" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date, :default => Time.mktime(1999)))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
       
-      it "should not select an option if the :default is provided as nil" do
+      it "should not select an option if the :selected is provided as nil" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :date, :default => nil))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :date, :selected => nil))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
-      it "should select Time.now if a :default is not provided" do
+      it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='#{Time.now.year}'][@selected]", :count => 1)
+        output_buffer.concat(form) if Formtastic::Util.rails3?
+        output_buffer.should_not have_tag("form li ol li select option[@selected]")
         
       end
     end
@@ -109,9 +132,10 @@ describe 'date input' do
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -120,9 +144,10 @@ describe 'date input' do
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
@@ -133,7 +158,7 @@ describe 'date input' do
 
   it 'should warn about :selected deprecation' do
     with_deprecation_silenced do
-      ::ActiveSupport::Deprecation.should_receive(:warn)
+      ::ActiveSupport::Deprecation.should_receive(:warn).any_number_of_times
       semantic_form_for(@new_post) do |builder|
         concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
       end