formtastic 1.0.1 → 1.1.0.beta

data/spec/label_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#label' do
 
@@ -32,16 +32,18 @@ describe 'SemanticFormBuilder#label' do
 
   describe 'when a collection is given' do
     it 'should use a supplied label_method for simple collections' 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(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => :to_s, :label_method => proc {|f| ('Label_%s' % [f])}))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol li label', :with => /Label_[abc]/, :count => 3)
     end
 
     it 'should use a supplied value_method for simple collections' 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(:author_id, :as => :check_boxes, :collection => [:a, :b, :c], :value_method => proc {|f| ('Value_%s' % [f.to_s])}))
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_a"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_b"]')
       output_buffer.should have_tag('form li fieldset ol li label input[value="Value_c"]')

data/spec/semantic_errors_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_errors' do
 
@@ -17,7 +17,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   describe 'when there is only one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -29,7 +29,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   describe 'when there is more than one error on base' do
     before do
-      @errors.stub!(:on_base).and_return(@base_errors)
+      @errors.stub!(:[]).with(:base).and_return(@base_errors)
     end
 
     it 'should render an unordered list' do
@@ -45,7 +45,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   describe 'when there are errors on title' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      @errors.stub!(:on_base).and_return([])
+      @errors.stub!(:[]).with(:base).and_return([])
     end
 
     it 'should render an unordered list' do
@@ -59,7 +59,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   describe 'when there are errors on title and base' do
     before do
       @errors.stub!(:[]).with(:title).and_return(@title_errors)
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list' do
@@ -74,7 +74,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
   describe 'when there are no errors' do
     before do
       @errors.stub!(:[]).with(:title).and_return(nil)
-      @errors.stub!(:on_base).and_return(nil)
+      @errors.stub!(:[]).with(:base).and_return(nil)
     end
 
     it 'should return nil' do
@@ -86,7 +86,7 @@ describe 'SemanticFormBuilder#semantic_errors' do
 
   describe 'when there is one error on base and options with class is passed' do
     before do
-      @errors.stub!(:on_base).and_return(@base_error)
+      @errors.stub!(:[]).with(:base).and_return(@base_error)
     end
 
     it 'should render an unordered list with given class' do

data/spec/semantic_fields_for_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'SemanticFormBuilder#semantic_fields_for' do
 
@@ -29,11 +29,12 @@ describe 'SemanticFormBuilder#semantic_fields_for' do
   
   it 'should sanitize html id for li tag' do
     @bob.stub!(:column_for_attribute).and_return(mock('column', :type => :string, :limit => 255))
-    semantic_form_for(@new_post) do |builder|
-      builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
+    form = semantic_form_for(@new_post) do |builder|
+      concat(builder.semantic_fields_for(@bob, :index => 1) do |nested_builder|
         concat(nested_builder.inputs(:login))
-      end
+      end)
     end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag('form fieldset.inputs #post_author_1_login_input')
     # Not valid selector, so using good ol' regex
     output_buffer.should_not =~ /id="post\[author\]_1_login_input"/

data/spec/spec_helper.rb

@@ -1,52 +1,47 @@
 # coding: utf-8
 require 'rubygems'
-
-gem 'i18n', '< 0.4'
-
-gem 'activesupport', '2.3.8'
-gem 'actionpack', '2.3.8'
 require 'active_support'
 require 'action_pack'
 require 'action_view'
 require 'action_controller'
+require 'action_mailer'
 
-
-
-gem 'rspec', '>= 1.2.6'
-gem 'rspec-rails', '>= 1.2.6'
-gem 'hpricot', '>= 0.6.1'
-gem 'rspec_tag_matchers', '>= 1.0.0'
-require 'rspec_tag_matchers'
-
-require 'custom_macros'
-
-Spec::Runner.configure do |config|
-  config.include(RspecTagMatchers)
-  config.include(CustomMacros)
-end
-
-require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/util'))
+require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic'))
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/formtastic/layout_helper'))
 
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories in alphabetic order.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each {|f| require f}
 
 module FormtasticSpecHelper
+  include ActionPack
+  include ActionView::Context if defined?(ActionView::Context)
+  include ActionController::RecordIdentifier
   include ActionView::Helpers::FormHelper
   include ActionView::Helpers::FormTagHelper
   include ActionView::Helpers::FormOptionsHelper
   include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::TextHelper
-  include ActionView::Helpers::ActiveRecordHelper
-  include ActionView::Helpers::RecordIdentificationHelper
+  include ActionView::Helpers::ActiveRecordHelper if defined?(ActionView::Helpers::ActiveRecordHelper)
+  include ActionView::Helpers::ActiveModelHelper if defined?(ActionView::Helpers::ActiveModelHelper)
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::CaptureHelper
   include ActionView::Helpers::AssetTagHelper
   include ActiveSupport
-  include ActionController::PolymorphicRoutes
+  include ActionController::PolymorphicRoutes if defined?(ActionController::PolymorphicRoutes)
   
   include Formtastic::SemanticFormHelper
   
+  def rails3?
+    ActionPack::VERSION::MAJOR > 2
+  end
+
+  def rails2?
+    ActionPack::VERSION::MAJOR == 2
+  end
+  
   def default_input_type(column_type, column_name = :generic_column_name)
     @new_post.stub!(column_name)
     @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => column_type)) unless column_type.nil?
@@ -58,27 +53,56 @@ module FormtasticSpecHelper
     return @default_type
   end
   
+  def active_model_presence_validator(attributes, options = {})
+    presence_validator = mock('ActiveModel::Validations::PresenceValidator', :attributes => attributes, :options => options)
+    presence_validator.stub!(:kind).and_return(:presence)
+    presence_validator
+  end
+  
   class ::Post
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def id
     end
+
+    def persisted?
+    end
   end
   module ::Namespaced
     class Post
+      extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+      include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
       def id
       end
+
+      def persisted?
+      end
     end
   end
   class ::Author
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+
     def to_label
     end
   end
   class ::Continent
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
+  end
+  class ::PostModel
+    extend ActiveModel::Naming if defined?(ActiveModel::Naming)
+    include ActiveModel::Conversion if defined?(ActiveModel::Conversion)
   end
   
   def mock_everything
     
     # Resource-oriented styles like form_for(@post) will expect a path method for the object,
     # so we're defining some here.
+    def post_models_path; "/postmodels/1"; end
+
     def post_path(o); "/posts/1"; end
     def posts_path; "/posts"; end
     def new_post_path; "/posts/new"; end
@@ -88,14 +112,18 @@ module FormtasticSpecHelper
     def new_author_path; "/authors/new"; end
     
     @fred = mock('user')
+    @fred.stub!(:to_ary)
     @fred.stub!(:class).and_return(::Author)
     @fred.stub!(:to_label).and_return('Fred Smith')
     @fred.stub!(:login).and_return('fred_smith')
     @fred.stub!(:id).and_return(37)
     @fred.stub!(:new_record?).and_return(false)
     @fred.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @fred.stub!(:to_key).and_return(nil)
+    @fred.stub!(:persisted?).and_return(nil)
 
     @bob = mock('user')
+    @bob.stub!(:to_ary)
     @bob.stub!(:class).and_return(::Author)
     @bob.stub!(:to_label).and_return('Bob Rock')
     @bob.stub!(:login).and_return('bob')
@@ -105,37 +133,50 @@ module FormtasticSpecHelper
     @bob.stub!(:post_ids).and_return([])
     @bob.stub!(:new_record?).and_return(false)
     @bob.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @bob.stub!(:to_key).and_return(nil)
+    @bob.stub!(:persisted?).and_return(nil)
     
     @james = mock('user')
-     @james.stub!(:class).and_return(::Author)
-     @james.stub!(:to_label).and_return('James Shock')
-     @james.stub!(:login).and_return('james')
-     @james.stub!(:id).and_return(75)
-     @james.stub!(:posts).and_return([])
-     @james.stub!(:post_ids).and_return([])
-     @james.stub!(:new_record?).and_return(false)
-     @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:to_ary)
+    @james.stub!(:class).and_return(::Author)
+    @james.stub!(:to_label).and_return('James Shock')
+    @james.stub!(:login).and_return('james')
+    @james.stub!(:id).and_return(75)
+    @james.stub!(:posts).and_return([])
+    @james.stub!(:post_ids).and_return([])
+    @james.stub!(:new_record?).and_return(false)
+    @james.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @james.stub!(:to_key).and_return(nil)
+    @james.stub!(:persisted?).and_return(nil)
     
 
     ::Author.stub!(:find).and_return([@fred, @bob])
+    ::Author.stub!(:all).and_return([@fred, @bob])
+    ::Author.stub!(:to_ary)
     ::Author.stub!(:human_attribute_name).and_return { |column_name| column_name.humanize }
     ::Author.stub!(:human_name).and_return('::Author')
-    ::Author.stub!(:reflect_on_validations_for).and_return([])
     ::Author.stub!(:reflect_on_association).and_return { |column_name| mock('reflection', :options => {}, :klass => Post, :macro => :has_many) if column_name == :posts }
     ::Author.stub!(:content_columns).and_return([mock('column', :name => 'login'), mock('column', :name => 'created_at')])
+    ::Author.stub!(:to_key).and_return(nil)
+    ::Author.stub!(:persisted?).and_return(nil)
 
     # Sometimes we need a mock @post object and some Authors for belongs_to
     @new_post = mock('post')
+    @new_post.stub!(:to_ary)
     @new_post.stub!(:class).and_return(::Post)
     @new_post.stub!(:id).and_return(nil)
     @new_post.stub!(:new_record?).and_return(true)
     @new_post.stub!(:errors).and_return(mock('errors', :[] => nil))
     @new_post.stub!(:author).and_return(nil)
-		@new_post.stub!(:reviewer).and_return(nil)
+    @new_post.stub!(:reviewer).and_return(nil)
     @new_post.stub!(:main_post).and_return(nil)
     @new_post.stub!(:sub_posts).and_return([]) #TODO should be a mock with methods for adding sub posts
+    @new_post.stub!(:to_key).and_return(nil)
+    @new_post.stub!(:to_model).and_return(@new_post)
+    @new_post.stub!(:persisted?).and_return(nil)
 
     @freds_post = mock('post')
+    @freds_post.stub!(:to_ary)
     @freds_post.stub!(:class).and_return(::Post)
     @freds_post.stub!(:to_label).and_return('Fred Smith')
     @freds_post.stub!(:id).and_return(19)
@@ -145,6 +186,8 @@ module FormtasticSpecHelper
     @freds_post.stub!(:author_ids).and_return([@fred.id])
     @freds_post.stub!(:new_record?).and_return(false)
     @freds_post.stub!(:errors).and_return(mock('errors', :[] => nil))
+    @freds_post.stub!(:to_key).and_return(nil)
+    @freds_post.stub!(:persisted?).and_return(nil)
     @fred.stub!(:posts).and_return([@freds_post])
     @fred.stub!(:post_ids).and_return([@freds_post.id])
 
@@ -159,8 +202,8 @@ module FormtasticSpecHelper
         mock = mock('reflection', :options => {}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
-			when :reviewer
-				mock = mock('reflection', :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to)
+      when :reviewer
+        mock = mock('reflection', :options => {:class_name => 'Author'}, :klass => ::Author, :macro => :belongs_to)
         mock.stub!(:[]).with(:class_name).and_return("Author")
         mock
       when :authors
@@ -173,9 +216,14 @@ module FormtasticSpecHelper
       
     end
     ::Post.stub!(:find).and_return([@freds_post])
+    ::Post.stub!(:all).and_return([@freds_post])
     ::Post.stub!(:content_columns).and_return([mock('column', :name => 'title'), mock('column', :name => 'body'), mock('column', :name => 'created_at')])
+    ::Post.stub!(:to_key).and_return(nil)
+    ::Post.stub!(:persisted?).and_return(nil)
+    ::Post.stub!(:to_ary)
     
     @new_post.stub!(:title)
+    @new_post.stub!(:to_ary)
     @new_post.stub!(:body)
     @new_post.stub!(:published)
     @new_post.stub!(:publish_at)
@@ -202,8 +250,8 @@ module FormtasticSpecHelper
     @new_post.stub!(:author).and_return(@bob)
     @new_post.stub!(:author_id).and_return(@bob.id)
 
-		@new_post.stub!(:reviewer).and_return(@fred)
-		@new_post.stub!(:reviewer_id).and_return(@fred.id)
+    @new_post.stub!(:reviewer).and_return(@fred)
+    @new_post.stub!(:reviewer_id).and_return(@fred.id)
 
     @new_post.should_receive(:publish_at=).any_number_of_times
     @new_post.should_receive(:title=).any_number_of_times

data/spec/{custom_macros.rb → support/custom_macros.rb}

@@ -8,66 +8,77 @@ module CustomMacros
     
     def it_should_have_input_wrapper_with_class(class_name)
       it "should have input wrapper with class '#{class_name}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li.#{class_name}") 
       end
     end
     
     def it_should_have_input_wrapper_with_id(id_string)
       it "should have input wrapper with id '#{id_string}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li##{id_string}") 
       end
     end
     
     def it_should_not_have_a_label
       it "should not have a label" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li label") 
       end
     end
     
     def it_should_have_a_nested_fieldset
       it "should have a nested_fieldset" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li fieldset") 
       end
     end
     
     def it_should_have_label_with_text(string_or_regex)
       it "should have a label with text '#{string_or_regex}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label", string_or_regex) 
       end
     end
     
     def it_should_have_label_for(element_id)
       it "should have a label for ##{element_id}" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li label[@for='#{element_id}']")
       end
     end
     
     def it_should_have_input_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input##{element_id}")
       end
     end
     
     def it_should_have_input_with_type(input_type)
       it "should have a #{input_type} input" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@type=\"#{input_type}\"]")
       end
     end
     
     def it_should_have_input_with_name(name)
       it "should have an input named #{name}" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_name(name)
       it "should have an input named #{name}" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea[@name=\"#{name}\"]")
       end
     end
     
     def it_should_have_textarea_with_id(element_id)
       it "should have an input with id '#{element_id}'" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li textarea##{element_id}")
       end
     end
@@ -76,27 +87,30 @@ module CustomMacros
       it 'should use default_text_field_size when method has no database column' do
         @new_post.stub!(:column_for_attribute).and_return(nil) # Return a nil column
         
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{Formtastic::SemanticFormBuilder.default_text_field_size}']")
       end
     end
     
     def it_should_apply_custom_input_attributes_when_input_html_provided(as)
       it 'it should apply custom input attributes when input_html provided' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :class => 'myclass' }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input.myclass")
       end
     end
     
     def it_should_apply_custom_for_to_label_when_input_html_id_provided(as)
       it 'it should apply custom for to label when input_html :id provided' do
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as, :input_html => { :id => 'myid' }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li label[@for="myid"]')
       end
     end
@@ -104,6 +118,7 @@ module CustomMacros
     def it_should_have_maxlength_matching_column_limit
       it 'should have a maxlength matching column limit' do
         @new_post.column_for_attribute(:title).limit.should == 50
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@maxlength='50']")
       end
     end
@@ -113,10 +128,11 @@ module CustomMacros
         default_size = Formtastic::SemanticFormBuilder.default_text_field_size
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => default_size * 2))
 
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
 
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{default_size}']")
       end
     end
@@ -126,10 +142,11 @@ module CustomMacros
         column_limit_shorted_than_default = 1
         @new_post.stub!(:column_for_attribute).and_return(mock('column', :type => as, :limit => column_limit_shorted_than_default))
 
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => as))
         end
 
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li input[@size='#{column_limit_shorted_than_default}']")
       end
     end
@@ -144,72 +161,82 @@ module CustomMacros
         end
 
         it 'should apply an errors class to the list item' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error')
         end
 
         it 'should not wrap the input with the Rails default error wrapping' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('div.fieldWithErrors')
         end
 
         it 'should render a paragraph for the errors' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :sentence
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
           ::Formtastic::SemanticFormBuilder.inline_errors = :list
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag('form li.error ul.errors')
         end
       end
 
       describe 'when there are no errors on the object for this method' do
         before do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:title, :as => type))
           end
         end
 
         it 'should not apply an errors class to the list item' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
 
       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 => type))
           end
         end
 
         it 'should not apply an errors class to the list item' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error')
         end
 
         it 'should not render a paragraph for the errors' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error p.inline-errors')
         end
 
         it 'should not display an error list' do
+          output_buffer.concat(@form) if Formtastic::Util.rails3?
           output_buffer.should_not have_tag('form li.error ul.errors')
         end
       end
@@ -217,8 +244,8 @@ module CustomMacros
     
     def it_should_call_find_on_association_class_when_no_collection_is_provided(as)
       it "should call find on the association class when no collection is provided" do
-        ::Author.should_receive(:find)
-        semantic_form_for(@new_post) do |builder|
+        ::Author.should_receive(:all)
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end
       end
@@ -232,17 +259,11 @@ module CustomMacros
           output_buffer.replace '' # clears the output_buffer from the before block, hax!
         end
 
-        it 'should not call find() on the parent class' do
-          ::Author.should_not_receive(:find)
-          semantic_form_for(@new_post) do |builder|
-            concat(builder.input(:author, :as => as, :collection => @authors))
-          end
-        end
-
         it 'should use the provided collection' do
-          semantic_form_for(@new_post) do |builder|
+          form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:author, :as => as, :collection => @authors))
           end
+          output_buffer.concat(form) if Formtastic::Util.rails3?
           output_buffer.should have_tag("form li.#{as} #{countable}", :count => @authors.size + (as == :select ? 1 : 0))
         end
 
@@ -252,9 +273,10 @@ module CustomMacros
           end
 
           it "should use the string as the label text and value for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |value|
               output_buffer.should have_tag("form li.#{as}", /#{value}/)
@@ -265,11 +287,13 @@ module CustomMacros
           if as == :radio
             it 'should generate a sanitized label for attribute' do
               @bob.stub!(:category_name).and_return(@categories)
-              semantic_form_for(@new_post) do |builder|
-                builder.semantic_fields_for(@bob) do |bob_builder|
+              form = semantic_form_for(@new_post) do |builder|
+                fields = builder.semantic_fields_for(@bob) do |bob_builder|
                   concat(bob_builder.input(:category_name, :as => as, :collection => @categories))
                 end
+                concat(fields)
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_general']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_design']")
               output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_category_name_development']")
@@ -284,9 +308,10 @@ module CustomMacros
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -301,9 +326,10 @@ module CustomMacros
           end
 
           it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |text, value|
               label = as == :select ? :option : :label
@@ -321,9 +347,10 @@ module CustomMacros
             end
         
             it "should use the first value as the label text and the last value as the value attribute for #{countable}" do
-              semantic_form_for(@new_post) do |builder|
+              form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:category_name, :as => as, :collection => @choices))
               end
+              output_buffer.concat(form) if Formtastic::Util.rails3?
               
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_true")
               output_buffer.should have_tag("form li.#{as} #{countable}#post_category_name_false")
@@ -337,9 +364,10 @@ module CustomMacros
           end
 
           it "should use the symbol as the label text and value for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |value|
               label = as == :select ? :option : :label
@@ -355,9 +383,10 @@ module CustomMacros
           end
 
           it "should use the key as the label text and the hash value as the value attribute for each #{countable}" do
-            semantic_form_for(@new_post) do |builder|
+            form = semantic_form_for(@new_post) do |builder|
               concat(builder.input(:category_name, :as => as, :collection => @categories))
             end
+            output_buffer.concat(form) if Formtastic::Util.rails3?
 
             @categories.each do |label, value|
               output_buffer.should have_tag("form li.#{as}", /#{label}/)
@@ -371,12 +400,13 @@ module CustomMacros
           
           describe 'as a symbol' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => :login))
               end
             end
 
             it 'should have options with text content from the specified method' do
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login}/)
               end
@@ -385,12 +415,13 @@ module CustomMacros
           
           describe 'as a proc' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form  = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :label_method => Proc.new {|a| a.login.reverse }))
               end
             end
             
             it 'should have options with the proc applied to each' do
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as}", /#{author.login.reverse}/)
               end
@@ -404,15 +435,16 @@ module CustomMacros
 
             describe "when the collection objects respond to #{label_method}" do
               before do
-                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method }
+                @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method || m.to_s == 'id' }
                 ::Author.find(:all).each { |a| a.stub!(label_method).and_return('The Label Text') }
 
-                semantic_form_for(@new_post) do |builder|
+                @form = semantic_form_for(@new_post) do |builder|
                   concat(builder.input(:author, :as => as))
                 end
               end
 
               it "should render the options with #{label_method} as the label" do
+                output_buffer.concat(@form) if Formtastic::Util.rails3?
                 ::Author.find(:all).each do |author|
                   output_buffer.should have_tag("form li.#{as}", /The Label Text/)
                 end
@@ -426,12 +458,13 @@ module CustomMacros
           
           describe 'as a symbol' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => :login))
               end
             end
             
             it 'should have options with values from specified method' do
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login}']")
               end
@@ -440,12 +473,13 @@ module CustomMacros
           
           describe 'as a proc' do
             before do
-              semantic_form_for(@new_post) do |builder|
+              @form = semantic_form_for(@new_post) do |builder|
                 concat(builder.input(:author, :as => as, :value_method => Proc.new {|a| a.login.reverse }))
               end
             end
 
             it 'should have options with the proc applied to each value' do
+              output_buffer.concat(@form) if Formtastic::Util.rails3?
               ::Author.find(:all).each do |author|
                 output_buffer.should have_tag("form li.#{as} #{countable}[@value='#{author.login.reverse}']")
               end