formtastic-rails3 0.9.7 → 0.9.10.0

data/spec/inputs/string_input_spec.rb

@@ -6,10 +6,10 @@ describe 'string 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(:title, :as => :string))
     end
   end
@@ -31,7 +31,7 @@ describe 'string input' do
   
   describe "when no object is provided" do
     before 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(:title, :as => :string))
       end
     end

data/spec/inputs/text_input_spec.rb

@@ -6,10 +6,10 @@ describe 'text 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(:body, :as => :text))
     end
   end
@@ -23,9 +23,10 @@ describe 'text input' do
   it_should_apply_error_logic_for_input_type(:numeric)
   
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li textarea.myclass")
   end
     

data/spec/inputs/time_input_spec.rb

@@ -6,108 +6,164 @@ describe 'time input' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
+  end
+  
+  describe "general" do
+    before do
+      ::I18n.backend.reload!
+      output_buffer.replace ''
+    end
+
+    describe "without seconds" do
+      before do
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time))
+        end
+      end
+     
+      it_should_have_input_wrapper_with_class("time")
+      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(:time)
+    
+      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.time 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.time fieldset legend.label label[@for="post_publish_at_1i"]')
+      end
     
-    semantic_form_for(@new_post) do |builder|
-      concat(builder.input(:publish_at, :as => :time))
+      it 'should have an ordered list of two items inside the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li.time fieldset ol')
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+      end
+
+      it 'should have five labels for hour and minute' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+      end
+    
+      it 'should have two selects for hour and minute' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
+      end
     end
-  end
-   
-  it_should_have_input_wrapper_with_class("time")
-  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(:time)
 
-  it 'should have a legend and label with the label text inside the fieldset' do
-    output_buffer.should have_tag('form li.time 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.time fieldset legend.label label[@for="post_publish_at_2i"]')
-  end
+    describe "with seconds" do
+      before do
+        @form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time, :include_seconds => true))
+        end
+      end
+    
+      it 'should have five labels for hour and minute' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li.time fieldset ol li label', :count => 3)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+        output_buffer.should have_tag('form li.time fieldset ol li label', /second/i)
+      end
 
-  it 'should have an ordered list of two items inside the fieldset' do
-    output_buffer.should have_tag('form li.time fieldset ol')
-    output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
-  end
+      it 'should have three selects for hour, minute and seconds' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        output_buffer.should have_tag('form li.time fieldset ol li', :count => 3)
+      end
 
-  it 'should have five labels for hour and minute' do
-    output_buffer.should have_tag('form li.time fieldset ol li label', :count => 2)
-    output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
-    output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
+      it 'should generate a sanitized label and matching ids for attribute' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
+        4.upto(6) do |i|
+          output_buffer.should have_tag("form li fieldset ol li label[@for='post_publish_at_#{i}i']")
+          output_buffer.should have_tag("form li fieldset ol li #post_publish_at_#{i}i")
+        end
+      end
+    end
   end
 
-  it 'should have two selects for hour and minute' do
-    output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
-  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, 11, 30, 21, 45))
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:created_at, :as => :time, :default => Time.mktime(1999, 12, 31, 22, 59)))
+        with_deprecation_silenced do 
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='21'][@selected]", :count => 1)
       end
     end
     
-    describe 'when the object has no value' do
-      it "should select the :default if provided as a Time" do
+    describe 'when the object has no value (nil)' 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 => :time, :default => Time.mktime(1999, 12, 31, 22, 59)))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :selected => Time.mktime(1999, 12, 31, 22, 59)))
+          end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='22'][@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 => :time, :default => nil))
+        with_deprecation_silenced do 
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:created_at, :as => :time, :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_4i 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 => :time))
         end
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@selected]", :count => 1)
-        output_buffer.should have_tag("form li ol li select#post_created_at_4i option[@value='#{Time.now.hour.to_s.rjust(2,'0')}'][@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
     
   end
-
+  
   describe ':labels option' do
-    fields = [:hour, :minute]
+    fields = [:hour, :minute, :second]
     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|
-          concat(builder.input(:created_at, :as => :time, :labels => { field => "another #{field} label" }))
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
         end
       end
-
+  
       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|
-          concat(builder.input(:created_at, :as => :time, :labels => { field => "" }))
+        form = semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.time fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
@@ -115,14 +171,14 @@ describe 'time input' do
       end
     end
   end
-
+  
   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 => :time, :selected => Time.mktime(1999)))
       end
     end
   end
-
+  
 end

data/spec/inputs/time_zone_input_spec.rb

@@ -6,10 +6,10 @@ describe 'time_zone 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(:time_zone))
     end
   end
@@ -19,38 +19,43 @@ describe 'time_zone input' do
   it_should_apply_error_logic_for_input_type(:time_zone)
   
   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_time_zone"]')
     output_buffer.should have_tag('form li label', /Time zone/)
   end
 
   it "should generate a select" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li select")
     output_buffer.should have_tag("form li select#post_time_zone")
     output_buffer.should have_tag("form li select[@name=\"post[time_zone]\"]")
   end
 
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li select.myclass")
   end
 
   describe 'when no object is given' do
     before(:each) 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(:time_zone, :as => :time_zone))
       end
     end
 
     it 'should generate labels' 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="project_time_zone"]')
       output_buffer.should have_tag('form li label', /Time zone/)
     end
 
     it 'should generate select inputs' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
       output_buffer.should have_tag("form li select#project_time_zone")
       output_buffer.should have_tag("form li select[@name=\"project[time_zone]\"]")
@@ -59,7 +64,7 @@ describe 'time_zone input' do
   
   describe 'when :selected is set' do
     before do
-      @output_buffer = ActiveSupport::SafeBuffer.new
+      @output_buffer = ''
     end
 
     # Note: Not possible to override default selected value for time_zone input
@@ -85,12 +90,15 @@ describe 'time_zone input' do
         # @new_post.stub!(:time_zone).and_return('Stockholm')
         @new_post.stub!(:time_zone).and_return(nil)
 
-        semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
+        with_deprecation_silenced do
+          @form = semantic_form_for(@new_post) do |builder|
+            concat(builder.input(:time_zone, :as => :time_zone, :selected => 'Melbourne'))
+          end
         end
       end
 
       it 'should have a selected item; the specified one' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@selected='selected']", :count => 1)
         output_buffer.should have_tag("form li select option[@selected='selected']", /Melbourne/i)
         output_buffer.should have_tag("form li select option[@selected='selected'][@value='Melbourne']")

data/spec/inputs_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#inputs' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
 
@@ -15,7 +15,7 @@ describe 'SemanticFormBuilder#inputs' do
     describe 'when no options are provided' do
       before do
         output_buffer.replace 'before_builder' # clear the output buffer and sets before_builder
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           @inputs_output = builder.inputs do
             concat('hello')
           end
@@ -23,33 +23,39 @@ describe 'SemanticFormBuilder#inputs' do
       end
 
       it 'should output just the content wrapped in inputs, not the whole template' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should      =~ /before_builder/
         @inputs_output.should_not =~ /before_builder/
       end
 
       it 'should render a fieldset inside the form, with a class of "inputs"' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs")
       end
 
       it 'should render an ol inside the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol")
       end
 
       it 'should render the contents of the block inside the ol' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
       end
 
       it 'should not render a legend inside the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form fieldset.inputs legend")
       end
 
       it 'should render a fieldset 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|
           @inputs_output = builder.inputs do
             concat('bye')
           end
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs ol", /bye/)
       end
     end
@@ -64,12 +70,14 @@ describe 'SemanticFormBuilder#inputs' do
       it 'should render nested inputs' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob] do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob] do |bob_builder|
             concat(bob_builder.input(:login))
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset.inputs #post_author_attributes_login")
         output_buffer.should_not have_tag("form fieldset.inputs #author_login")
 
@@ -78,11 +86,13 @@ describe 'SemanticFormBuilder#inputs' do
       describe "as a symbol representing the association name" do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => :author do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => :author do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -91,11 +101,13 @@ describe 'SemanticFormBuilder#inputs' do
       describe 'as an array containing the a symbole for the association name and the associated object' do
         
         it 'should nest the inputs with an _attributes suffix on the association name' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => [:author, @new_post.author] do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => [:author, @new_post.author] do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author_attributes][login]']")
         end
         
@@ -104,11 +116,13 @@ describe 'SemanticFormBuilder#inputs' do
       describe 'as an associated object' do
         
         it 'should not nest the inputs with an _attributes suffix' do
-          semantic_form_for(@new_post) do |post|
-            post.inputs :for => @new_post.author do |author|
+          form = semantic_form_for(@new_post) do |post|
+            inputs = post.inputs :for => @new_post.author do |author|
               concat(author.input(:login))
             end
+            concat(inputs)
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form input[@name='post[author][login]']")
         end
         
@@ -128,44 +142,52 @@ describe 'SemanticFormBuilder#inputs' do
       it 'should pass options down to semantic_fields_for' do
         @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
 
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat(bob_builder.input(:login))
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form fieldset ol li #post_author_attributes_10_login')
       end
 
       it 'should not add builder as a fieldset attribute tag' do
-        semantic_form_for(@new_post) do |builder|
-          builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
+        form = semantic_form_for(@new_post) do |builder|
+          inputs = builder.inputs :for => [:author, @bob], :for_options => { :index => 10 } do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::SemanticFormHelper"]')
       end
 
       it 'should send parent_builder as an option to allow child index interpolation' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
-          builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
+          inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
 
       it 'should also provide child index interpolation when nested child index is a hash' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
-          builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
+          inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
             concat('input')
           end
+          concat(inputs)
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
     end
@@ -177,19 +199,24 @@ describe 'SemanticFormBuilder#inputs' do
           @legend_text_using_name = "Advanced options 2"
           @legend_text_using_title = "Advanced options 3"
           @nested_forms_legend_text = "This is a nested form title"
-          semantic_form_for(@new_post) do |builder|
-            builder.inputs @legend_text do
+          @form = semantic_form_for(@new_post) do |builder|
+            inputs = builder.inputs @legend_text do
             end
-            builder.inputs :name => @legend_text_using_name do
+            concat(inputs)
+            inputs = builder.inputs :name => @legend_text_using_name do
             end
-            builder.inputs :title => @legend_text_using_title do
+            concat(inputs)
+            inputs = builder.inputs :title => @legend_text_using_title do
             end
-            builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
+            concat(inputs)
+            inputs = builder.inputs @nested_forms_legend_text, :for => :authors do |nf|
             end
+            concat(inputs)
           end
         end
 
         it 'should render a fieldset with a legend inside the form' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@legend_text_using_title}$/)
@@ -213,19 +240,24 @@ describe 'SemanticFormBuilder#inputs' do
                     }
                 }
             }
-          semantic_form_for(@new_post) do |builder|
-            builder.inputs :advanced_options do
+          @form = semantic_form_for(@new_post) do |builder|
+            inputs = builder.inputs :advanced_options do
             end
-            builder.inputs :name => :advanced_options_using_name do
+            concat(inputs)
+            inputs =builder.inputs :name => :advanced_options_using_name do
             end
-            builder.inputs :title => :advanced_options_using_title do
+            concat(inputs)
+            inputs = builder.inputs :title => :advanced_options_using_title do
             end
-            builder.inputs :nested_forms_title, :for => :authors do |nf|
+            concat(inputs)
+            inputs = builder.inputs :nested_forms_title, :for => :authors do |nf|
             end
+            concat(inputs)
           end
         end
 
         it 'should render a fieldset with a localized legend inside the form' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_name}$/)
           output_buffer.should have_tag("form fieldset legend", /^#{@localized_legend_text_using_title}$/)
@@ -239,13 +271,14 @@ describe 'SemanticFormBuilder#inputs' do
         @id_option = 'advanced'
         @class_option = 'wide'
 
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.inputs :id => @id_option, :class => @class_option do
           end
         end
       end
 
       it 'should pass the options into the fieldset tag as attributes' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form fieldset##{@id_option}")
         output_buffer.should have_tag("form fieldset.#{@class_option}")
       end
@@ -272,46 +305,55 @@ describe 'SemanticFormBuilder#inputs' do
 
     describe 'with no args' do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.inputs)
         end
       end
 
       it 'should render a form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form')
       end
 
       it 'should render a fieldset inside the form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs')
       end
 
       it 'should not render a legend in the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form > fieldset.inputs > legend')
       end
 
       it 'should render an ol in the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol')
       end
 
       it 'should render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
 
       it 'should render a string list item for title' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
       end
 
       it 'should render a text list item for body' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
       end
 
       it 'should render a select list item for author_id' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
 
       it 'should not render timestamps inputs by default' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     end
@@ -319,10 +361,11 @@ describe 'SemanticFormBuilder#inputs' do
     describe 'with column names as args' do
       describe 'and an object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:title, :body))
           end
 
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 2)
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string')
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.text')
@@ -331,10 +374,11 @@ describe 'SemanticFormBuilder#inputs' do
 
       describe 'and no object is given' do
         it 'should render a form with a fieldset containing two list items' do
-          semantic_form_for(:project, :url => 'http://test.host') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
             concat(builder.inputs(:title, :body))
           end
 
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form > fieldset.inputs > ol > li.string', :count => 2)
         end
       end
@@ -344,11 +388,11 @@ describe 'SemanticFormBuilder#inputs' do
       describe 'and an object is given' do
         it 'should render nested inputs' do
           @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
 
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset.inputs #post_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #author_login")
         end
@@ -356,10 +400,10 @@ describe 'SemanticFormBuilder#inputs' do
 
       describe 'and no object is given' do
         it 'should render nested inputs' do
-          semantic_form_for(:project, :url => 'http://test.host/') do |builder|
+          form = semantic_form_for(:project, :url => 'http://test.host/') do |builder|
             concat(builder.inputs(:login, :for => @bob))
           end
-
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form fieldset.inputs #project_author_login")
           output_buffer.should_not have_tag("form fieldset.inputs #project_login")
         end
@@ -368,7 +412,7 @@ describe 'SemanticFormBuilder#inputs' do
 
     describe 'with column names and an options hash as args' do
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           @legend_text_using_option = "Legendary Legend Text"
           @legend_text_using_arg = "Legendary Legend Text 2"
           concat(builder.inputs(:title, :body, :name => @legend_text_using_option, :id => "my-id"))
@@ -377,19 +421,21 @@ describe 'SemanticFormBuilder#inputs' do
       end
 
       it 'should render a form with a fieldset containing two list items' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset.inputs > ol > li', :count => 4)
       end
 
       it 'should pass the options down to the fieldset' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.inputs')
       end
 
       it 'should use the special :name option as a text for the legend tag' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form > fieldset#my-id.inputs > legend', /^#{@legend_text_using_option}$/)
         output_buffer.should have_tag('form > fieldset#my-id-2.inputs > legend', /^#{@legend_text_using_arg}$/)
       end
     end
 
   end
-
 end