formtastic-rails3 0.9.7 → 0.9.10.0

data/spec/custom_builder_spec.rb

@@ -12,7 +12,7 @@ describe 'Formtastic::SemanticFormHelper.builder' do
   end
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   

data/spec/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
@@ -218,7 +245,7 @@ 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|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:author, :as => as))
         end
       end
@@ -240,9 +267,10 @@ module CustomMacros
         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 +280,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 +294,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 +315,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 +333,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 +354,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 +371,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 +390,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 +407,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 +422,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
@@ -407,12 +445,13 @@ module CustomMacros
                 @fred.stub!(:respond_to?).and_return { |m| m.to_s == label_method }
                 ::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 +465,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 +480,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

data/spec/error_proc_spec.rb

@@ -6,7 +6,7 @@ describe 'Rails field_error_proc' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
   end
   

data/spec/errors_spec.rb

@@ -6,7 +6,7 @@ describe 'SemanticFormBuilder#errors_on' do
   include FormtasticSpecHelper
   
   before do
-    @output_buffer = ActiveSupport::SafeBuffer.new
+    @output_buffer = ''
     mock_everything
     @title_errors = ['must not be blank', 'must be longer than 10 characters', 'must be awesome']
     @errors = mock('errors')
@@ -81,5 +81,25 @@ describe 'SemanticFormBuilder#errors_on' do
     end
   end
   
+  
+  describe 'when there are errors on the association and column' do
+    
+    it "should list all unique errors" do
+      ::Formtastic::SemanticFormBuilder.inline_errors = :list
+      ::Post.stub!(:reflections).and_return({:author => mock('reflection', :options => {}, :macro => :belongs_to)})
+      
+      @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
+      
+      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
+    
+  end
+  
 end