formtastic 1.0.1 → 1.1.0.beta

data/spec/custom_builder_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'Formtastic::SemanticFormHelper.builder' do
 
@@ -29,7 +29,16 @@ describe 'Formtastic::SemanticFormHelper.builder' do
     ::Formtastic::SemanticFormHelper.builder = ::Formtastic::SemanticFormBuilder
     ::Formtastic::SemanticFormHelper.builder.should == ::Formtastic::SemanticFormBuilder
   end
-  
+
+  it 'should allow custom settings per form builder subclass' do
+    with_config(:all_fields_required_by_default, true) do
+      MyCustomFormBuilder.all_fields_required_by_default = false
+
+      MyCustomFormBuilder.all_fields_required_by_default.should be_false
+      ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should be_true
+    end
+  end
+
   describe "when using a custom builder" do
     
     before do
@@ -43,7 +52,7 @@ describe 'Formtastic::SemanticFormHelper.builder' do
     
     describe "semantic_form_for" do
       
-      it "should yeild and instance of the custom builder" do
+      it "should yield an instance of the custom builder" do
         semantic_form_for(@new_post) do |builder|
           builder.class.should == MyCustomFormBuilder
         end
@@ -56,7 +65,34 @@ describe 'Formtastic::SemanticFormHelper.builder' do
       end
     
     end
+
+    describe "semantic_fields_for" do
+
+      it "should yield an instance of the parent form builder" do
+        semantic_form_for(@new_post) do |builder|
+          builder.semantic_fields_for(:author) do |nested_builder|
+            nested_builder.class.should == MyCustomFormBuilder
+          end
+        end
+      end
+
+    end
     
   end
 
-end
+  describe "when using a builder passed to form options" do
+
+    describe "semantic_fields_for" do
+
+      it "should yield an instance of the parent form builder" do
+        semantic_form_for(@new_post, :builder => MyCustomFormBuilder) do |builder|
+          builder.semantic_fields_for(:author) do |nested_builder|
+            nested_builder.class.should == MyCustomFormBuilder
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/spec/defaults_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::SemanticFormBuilder-defaults' do
   

data/spec/error_proc_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'Rails field_error_proc' do
   

data/spec/errors_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#errors_on' do
   
@@ -91,9 +91,10 @@ describe 'SemanticFormBuilder#errors_on' do
       @errors.stub!(:[]).with(:author).and_return(['must not be blank'])
       @errors.stub!(:[]).with(:author_id).and_return(['is already taken', 'must not be blank']) # note the duplicate of association
       
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:author))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("ul.errors li", /must not be blank/, :count => 1)
       output_buffer.should have_tag("ul.errors li", /is already taken/, :count => 1)
     end

data/spec/form_helper_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormHelper' do
   
@@ -13,54 +13,62 @@ describe 'SemanticFormHelper' do
   describe '#semantic_form_for' do
 
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_form_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
 
     it 'adds a class of "formtastic" to the generated form' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.formtastic")
     end
 
     it 'adds class matching the object name to the generated form when a symbol is provided' do
-      semantic_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(@new_post, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.post")
 
-      semantic_form_for(:project, :url => '/hello') do |builder|
+      form = semantic_form_for(:project, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.project")
     end
 
     it 'adds class matching the object\'s class to the generated form when an object is provided' do
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.post")
     end
 
     it 'adds a namespaced class to the generated form' do
-      semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
+      form = semantic_form_for(::Namespaced::Post.new, :url => '/hello') do |builder|
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form.namespaced_post")
     end
 
     describe 'allows :html options' do
       before(:each) do
-        semantic_form_for(:post, ::Post.new, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
+         @form = semantic_form_for(@new_post, :url => '/hello', :html => { :id => "something-special", :class => "something-extra", :multipart => true }) do |builder|
         end
       end
 
       it 'to add a id of "something-special" to generated form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form#something-special")
       end
 
       it 'to add a class of "something-extra" to generated form' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form.something-extra")
       end
 
       it 'to add enctype="multipart/form-data"' do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form[@enctype="multipart/form-data"]')
       end
     end
@@ -71,16 +79,24 @@ describe 'SemanticFormHelper' do
         builder.object_name.should == "post"
       end
     end
-
+    
     it 'can be called with a generic style and instance variable' do
-      semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
-        builder.object.class.should == ::Post
-        builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+      if rails3?
+        semantic_form_for(@new_post, :as => :post, :url => new_post_path) do |builder|
+          builder.object.class.should == ::Post
+          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        end
+      end
+      if rails2?
+        semantic_form_for(:post, @new_post, :url => new_post_path) do |builder|
+          builder.object.class.should == ::Post
+          builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
+        end
       end
     end
 
     it 'can be called with a generic style and inline object' do
-      semantic_form_for(:post, ::Post.new, :url => new_post_path) do |builder|
+      semantic_form_for(@new_post, :url => new_post_path) do |builder|
         builder.object.class.should == ::Post
         builder.object_name.to_s.should == "post" # TODO: is this forced .to_s a bad assumption somewhere?
       end
@@ -90,7 +106,7 @@ describe 'SemanticFormHelper' do
       it "yields an instance of the given builder" do
         class MyAwesomeCustomBuilder < ::Formtastic::SemanticFormBuilder
         end
-        semantic_form_for(:post, ::Post.new, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
+        semantic_form_for(@new_post, :url => '/hello', :builder => MyAwesomeCustomBuilder) do |builder|
           builder.class.should == MyAwesomeCustomBuilder
         end
       end
@@ -100,7 +116,7 @@ describe 'SemanticFormHelper' do
 
   describe '#semantic_fields_for' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_fields_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_fields_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
@@ -108,7 +124,7 @@ describe 'SemanticFormHelper' do
 
   describe '#semantic_form_remote_for' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_form_remote_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_form_remote_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end
@@ -116,7 +132,7 @@ describe 'SemanticFormHelper' do
 
   describe '#semantic_form_for_remote' do
     it 'yields an instance of SemanticFormBuilder' do
-      semantic_remote_form_for(:post, ::Post.new, :url => '/hello') do |builder|
+      semantic_remote_form_for(@new_post, :url => '/hello') do |builder|
         builder.class.should == ::Formtastic::SemanticFormBuilder
       end
     end

data/spec/helpers/layout_helper_spec.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+require 'spec_helper'
+
+describe Formtastic::LayoutHelper do
+  
+  include FormtasticSpecHelper
+  include Formtastic::LayoutHelper
+  
+  describe '#formtastic_stylesheet_link_tag' do
+    
+    it 'should render a link to formtastic.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic.css']")
+    end
+    
+    it 'should render a link to formtastic_changes.css' do
+      formtastic_stylesheet_link_tag.should have_tag("link[@href='/stylesheets/formtastic_changes.css']")
+    end
+    
+  end
+end
+

data/spec/i18n_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[spec_helper])
+require 'spec_helper'
 
 describe 'Formtastic::I18n' do
   
@@ -26,11 +26,11 @@ describe 'Formtastic::I18n' do
       @formtastic_strings = {
           :yes            => 'Default Yes',
           :no             => 'Default No',
-          :create         => 'Default Create {{model}}',
-          :update         => 'Default Update {{model}}',
+          :create         => 'Default Create %{model}',
+          :update         => 'Default Update %{model}',
           :custom_scope   => {
               :duck           => 'Duck',
-              :duck_pond      => '{{ducks}} ducks in a pond'
+              :duck_pond      => '%{ducks} ducks in a pond'
             }
         }
       ::I18n.backend.store_translations :en, :formtastic => @formtastic_strings
@@ -71,7 +71,7 @@ describe 'Formtastic::I18n' do
 
     it "should use default strings" do
       (::Formtastic::I18n::DEFAULT_VALUES.keys).each do |key|
-        ::Formtastic::I18n.t(key, :model => '{{model}}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
+        ::Formtastic::I18n.t(key, :model => '%{model}').should == ::Formtastic::I18n::DEFAULT_VALUES[key]
       end
     end
     
@@ -109,34 +109,38 @@ describe 'Formtastic::I18n' do
     end
     
     it "should be able to translate with namespaced object" do
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:title))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello post!/)
     end
     
     it "should be able to translate without form-object" 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))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello project!/)
     end
     
     it 'should be able to translate nested objects with nested translations' do
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:task) do |f|
           concat(f.input(:name))
         end
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello task name!/)
     end
 
     it 'should be able to translated nested objects with top level translations' do
-      semantic_form_for(:order, :url => 'http://test.host') do |builder|
+      form = semantic_form_for(:order, :url => 'http://test.host') do |builder|
         builder.semantic_fields_for(:line_item) do |f|
           concat(f.input(:name))
         end
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form label", /Hello line item name!/)
     end
 

data/spec/include_blank_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "*select: options[:include_blank]" do
 
@@ -24,9 +24,10 @@ describe "*select: options[:include_blank]" do
     it 'blank value should be included if the default value specified in config is true' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = true
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end
@@ -34,9 +35,10 @@ describe "*select: options[:include_blank]" do
     it 'blank value should not be included if the default value specified in config is false' do
       ::Formtastic::SemanticFormBuilder.include_blank_for_select_by_default = false
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -49,9 +51,10 @@ describe "*select: options[:include_blank]" do
   describe 'when :include_blank is set to false' do
     it 'should not have a blank option' do
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => false))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li select option[@value='']", "")
       end
     end
@@ -60,9 +63,10 @@ describe "*select: options[:include_blank]" do
   describe 'when :include_blank => true is set' do
     it 'should have a blank select option' do
       @select_input_types.each do |as, attribute|
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(attribute, :as => as, :include_blank => true))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li select option[@value='']", "")
       end
     end

data/spec/input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#input' do
   
@@ -38,7 +38,7 @@ describe 'SemanticFormBuilder#input' do
 
     it 'should require the first argument (the method on form\'s object)' do
       lambda {
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input()) # no args passed in at all
         end
       }.should raise_error(ArgumentError)
@@ -59,17 +59,19 @@ describe 'SemanticFormBuilder#input' do
         end
 
         it 'should set a "required" class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.optional')
           output_buffer.should have_tag('form li.required')
         end
 
         it 'should append the "required" string to the label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => true))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.required label', /#{@new_string}$/)
         end
 
@@ -87,17 +89,19 @@ describe 'SemanticFormBuilder#input' do
         end
 
         it 'should set an "optional" class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.required')
           output_buffer.should have_tag('form li.optional')
         end
 
         it 'should append the "optional" string to the label' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :required => false))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.optional label', /#{@string}$/)
         end
 
@@ -111,9 +115,10 @@ describe 'SemanticFormBuilder#input' do
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
             ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-            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))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should_not have_tag('form li.required')
             output_buffer.should have_tag('form li.optional')
 
@@ -127,6 +132,7 @@ describe 'SemanticFormBuilder#input' do
           describe 'and the validation reflection plugin is available' do
 
             before do
+              ::Post.stub!(:reflect_on_validations_for).and_return([])
               @new_post.class.stub!(:method_defined?).with(:reflect_on_validations_for).and_return(true)
             end
 
@@ -139,10 +145,11 @@ describe 'SemanticFormBuilder#input' do
                   mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => {:if => true})
                 ])
 
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                   concat(builder.input(:body))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should have_tag('form li.required')
                 output_buffer.should_not have_tag('form li.optional')
               end
@@ -150,54 +157,56 @@ describe 'SemanticFormBuilder#input' do
               it 'should be not be required if the optional :if condition is not satisifed' do
                 should_be_required(:required => false, :options => { :if => false })
               end
-              
+
               it 'should not be required if the optional :if proc evaluates to false' do
                 should_be_required(:required => false, :options => { :if => proc { |record| false } })
               end
-              
+
               it 'should be required if the optional :if proc evaluates to true' do
                 should_be_required(:required => true, :options => { :if => proc { |record| true } })
               end
-              
+
               it 'should not be required if the optional :unless proc evaluates to true' do
                 should_be_required(:required => false, :options => { :unless => proc { |record| true } })
               end
-              
+
               it 'should be required if the optional :unless proc evaluates to false' do
                 should_be_required(:required => true, :options => { :unless => proc { |record| false } })
               end
-              
+
               it 'should be required if the optional :if with a method string evaluates to true' do
                 @new_post.should_receive(:required_condition).and_return(true)
                 should_be_required(:required => true, :options => { :if => :required_condition })
               end
-              
+
               it 'should be required if the optional :if with a method string evaluates to false' do
                 @new_post.should_receive(:required_condition).and_return(false)
                 should_be_required(:required => false, :options => { :if => :required_condition })
               end
-              
+
               it 'should not be required if the optional :unless with a method string evaluates to false' do
                  @new_post.should_receive(:required_condition).and_return(false)
                 should_be_required(:required => true, :options => { :unless => :required_condition })
               end
-              
+
                it 'should be required if the optional :unless with a method string evaluates to true' do
                  @new_post.should_receive(:required_condition).and_return(true)
                  should_be_required(:required => false, :options => { :unless => :required_condition })
                end
             end
-            
+
             # TODO make a matcher for this?
             def should_be_required(options)
               @new_post.class.should_receive(:reflect_on_validations_for).with(:body).and_return([
                 mock('MacroReflection', :macro => :validates_presence_of, :name => :body, :options => options[:options])
               ])
-              
-              semantic_form_for(@new_post) do |builder|
+
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:body))
               end
-              
+
+              output_buffer.concat(form) if Formtastic::Util.rails3?
+
               if options[:required]
                 output_buffer.should_not have_tag('form li.optional')
                 output_buffer.should have_tag('form li.required')
@@ -213,9 +222,117 @@ describe 'SemanticFormBuilder#input' do
               end
 
               it 'should not be required' do
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:title))
                 end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should_not have_tag('form li.required')
+                output_buffer.should have_tag('form li.optional')
+              end
+            end
+
+          end
+
+          describe 'and its a ActiveModel' do
+            before do
+              @new_post.stub!(:class).and_return(::PostModel)
+            end
+
+            after do
+              @new_post.stub!(:class).and_return(::Post)
+            end
+            describe 'and validates_presence_of was called for the method' do
+              it 'should be required' do
+
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([
+                  active_model_presence_validator([:title])
+                ])
+
+                @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                  active_model_presence_validator([:body], {:if => true})
+                ])
+
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                  concat(builder.input(:body))
+                end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
+                output_buffer.should have_tag('form li.required')
+                output_buffer.should_not have_tag('form li.optional')
+              end
+
+              it 'should be not be required if the optional :if condition is not satisifed' do
+                should_be_required(:required => false, :options => { :if => false })
+              end
+
+              it 'should not be required if the optional :if proc evaluates to false' do
+                should_be_required(:required => false, :options => { :if => proc { |record| false } })
+              end
+
+              it 'should be required if the optional :if proc evaluates to true' do
+                should_be_required(:required => true, :options => { :if => proc { |record| true } })
+              end
+
+              it 'should not be required if the optional :unless proc evaluates to true' do
+                should_be_required(:required => false, :options => { :unless => proc { |record| true } })
+              end
+
+              it 'should be required if the optional :unless proc evaluates to false' do
+                should_be_required(:required => true, :options => { :unless => proc { |record| false } })
+              end
+
+              it 'should be required if the optional :if with a method string evaluates to true' do
+                @new_post.should_receive(:required_condition).and_return(true)
+                should_be_required(:required => true, :options => { :if => :required_condition })
+              end
+
+              it 'should be required if the optional :if with a method string evaluates to false' do
+                @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => false, :options => { :if => :required_condition })
+              end
+
+              it 'should not be required if the optional :unless with a method string evaluates to false' do
+                 @new_post.should_receive(:required_condition).and_return(false)
+                should_be_required(:required => true, :options => { :unless => :required_condition })
+              end
+
+               it 'should be required if the optional :unless with a method string evaluates to true' do
+                 @new_post.should_receive(:required_condition).and_return(true)
+                 should_be_required(:required => false, :options => { :unless => :required_condition })
+               end
+            end
+
+            # TODO make a matcher for this?
+            def should_be_required(options)
+              @new_post.class.should_receive(:validators_on).with(:body).and_return([
+                active_model_presence_validator([:body], options[:options])
+              ])
+
+              form = semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:body))
+              end
+
+              output_buffer.concat(form) if Formtastic::Util.rails3?
+
+              if options[:required]
+                output_buffer.should_not have_tag('form li.optional')
+                output_buffer.should have_tag('form li.required')
+              else
+                output_buffer.should have_tag('form li.optional')
+                output_buffer.should_not have_tag('form li.required')
+              end
+            end
+
+            describe 'and validates_presence_of was not called for the method' do
+              before do
+                @new_post.class.should_receive(:validators_on).with(:title).and_return([])
+              end
+
+              it 'should not be required' do
+                form = semantic_form_for(@new_post) do |builder|
+                  concat(builder.input(:title))
+                end
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should_not have_tag('form li.required')
                 output_buffer.should have_tag('form li.optional')
               end
@@ -229,9 +346,10 @@ describe 'SemanticFormBuilder#input' do
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default.should == true
               ::Formtastic::SemanticFormBuilder.all_fields_required_by_default = false
 
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title))
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should_not have_tag('form li.required')
               output_buffer.should have_tag('form li.optional')
 
@@ -251,18 +369,20 @@ describe 'SemanticFormBuilder#input' do
       describe 'when not provided' do
 
         it 'should default to a string for forms without objects unless column is password' 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(:anything))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.string')
         end
 
         it 'should default to password for forms without objects if column is password' 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(:password))
             concat(builder.input(:password_confirmation))
             concat(builder.input(:confirm_password))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.password', :count => 3)
         end
 
@@ -337,7 +457,8 @@ describe 'SemanticFormBuilder#input' do
               column = mock('column')
 
               ::Formtastic::SemanticFormBuilder.file_methods.each do |test|
-                column.stub!(:respond_to?).with(test).and_return(method == test)
+                ### TODO: Check if this is ok
+                column.stub!(method).with(test).and_return(method == test)
               end
 
               @new_post.should_receive(method).and_return(column)
@@ -377,23 +498,27 @@ describe 'SemanticFormBuilder#input' do
       
       describe 'when provided' do
         it 'should be passed down to the label tag' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom"))
           end
+
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li label", /Kustom/)
         end
 
         it 'should not generate a label if false' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => false))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag("form li label")
         end
 
         it 'should be dupped if frozen' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :label => "Kustom".freeze))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li label", /Kustom/)
         end
       end
@@ -408,11 +533,12 @@ describe 'SemanticFormBuilder#input' do
                   @new_post.stub!(:meta_description)
                   @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return(@localized_label_text)
                 
-                  semantic_form_for(@new_post) do |builder|
+                  form = semantic_form_for(@new_post) do |builder|
                     concat(builder.input(:meta_description))
                   end
                 
-                  output_buffer.should have_tag('form li label', @localized_label_text)
+                  output_buffer.concat(form) if Formtastic::Util.rails3?
+                  output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
                 end
               end
             end
@@ -424,10 +550,11 @@ describe 'SemanticFormBuilder#input' do
             it 'should default the humanized method name, passing it down to the label tag' do
               ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
-              semantic_form_for(:project, :url => 'http://test.host') do |builder|
+              form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
               end
 
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -437,10 +564,11 @@ describe 'SemanticFormBuilder#input' do
               @new_post.stub!(:meta_description) # a two word method name
               @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
 
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:meta_description))
               end
 
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
@@ -450,10 +578,11 @@ describe 'SemanticFormBuilder#input' do
               with_config :label_str_method, :capitalize do
                 @new_post.stub!(:meta_description)
             
-                semantic_form_for(@new_post) do |builder|
+                form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:meta_description))
                 end
             
+                output_buffer.concat(form) if Formtastic::Util.rails3?
                 output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
               end
             end
@@ -479,11 +608,12 @@ describe 'SemanticFormBuilder#input' do
           end
 
           it 'should render a label with localized label (I18n)' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.should have_tag('form li label', @localized_label_text)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.should have_tag('form li label', Regexp.new('^' + @localized_label_text))
           end
 
           it 'should render a hint paragraph containing an optional localized label (I18n) if first is not set' do
@@ -496,11 +626,12 @@ describe 'SemanticFormBuilder#input' do
                      }
                    }
                 }
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title, :label => true))
               concat(builder.input(:published, :as => :boolean, :label => true))
             end
-            output_buffer.should have_tag('form li label', @default_localized_label_text)
+            output_buffer.concat(form) if Formtastic::Util.rails3?
+            output_buffer.should have_tag('form li label', Regexp.new('^' + @default_localized_label_text))
           end
         end
       end
@@ -512,9 +643,10 @@ describe 'SemanticFormBuilder#input' do
       describe 'when provided' do
         it 'should be passed down to the paragraph tag' do
           hint_text = "this is the title of the post"
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :hint => hint_text))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li p.inline-hints", hint_text)
         end
       end
@@ -532,11 +664,11 @@ describe 'SemanticFormBuilder#input' do
                 }
             ::Formtastic::SemanticFormBuilder.i18n_lookups_by_default = false
           end
-          
+
           after do
             ::I18n.backend.reload!
           end
-          
+
           describe 'when provided value (hint value) is set to TRUE' do
             it 'should render a hint paragraph containing a localized hint (I18n)' do
               ::I18n.backend.store_translations :en,
@@ -547,25 +679,28 @@ describe 'SemanticFormBuilder#input' do
                      }
                    }
                 }
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag('form li p.inline-hints', @localized_hint_text)
             end
             
             it 'should render a hint paragraph containing an optional localized hint (I18n) if first is not set' do
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => true))
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag('form li p.inline-hints', @default_localized_hint_text)
             end
           end
           
           describe 'when provided value (label value) is set to FALSE' do
             it 'should not render a hint paragraph' do
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:title, :hint => false))
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should_not have_tag('form li p.inline-hints', @localized_hint_text)
             end
           end
@@ -590,9 +725,10 @@ describe 'SemanticFormBuilder#input' do
         
         describe 'when localized hint (I18n) is not provided' do
           it 'should not render a hint paragraph' do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:title))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
             output_buffer.should_not have_tag('form li p.inline-hints')
           end
         end
@@ -604,25 +740,28 @@ describe 'SemanticFormBuilder#input' do
 
       describe 'when provided' do
         it 'should be passed down to the li tag' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:id => :another_id}))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li#another_id")
         end
 
         it 'should append given classes to li default classes' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => :another_class}, :required => true))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.required")
           output_buffer.should have_tag("form li.another_class")
         end
 
         it 'should allow classes to be an array' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :wrapper_html => {:class => [ :my_class, :another_class ]}))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.string")
           output_buffer.should have_tag("form li.my_class")
           output_buffer.should have_tag("form li.another_class")
@@ -631,9 +770,10 @@ describe 'SemanticFormBuilder#input' do
 
       describe 'when not provided' do
         it 'should use default id and class' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li#post_title_input")
           output_buffer.should have_tag("form li.string")
         end