formtastic 1.0.1 → 1.1.0.beta

data/spec/inputs/country_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'country input' do
   
@@ -25,7 +25,7 @@ describe 'country input' do
   describe "when country_select is available as a helper (from a plugin)" do
     
     before do
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         concat(builder.input(:country, :as => :country))
       end
@@ -38,12 +38,14 @@ describe 'country input' do
     #it_should_apply_error_logic_for_input_type(:country)
 
     it 'should generate a label for the input' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li label')
       output_buffer.should have_tag('form li label[@for="post_country"]')
       output_buffer.should have_tag('form li label', /Country/)
     end
 
     it "should generate a select" do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li select")
     end
     
@@ -67,7 +69,7 @@ describe 'country input' do
       priority_countries.should_not be_nil
       
       semantic_form_for(@new_post) do |builder|
-        builder.stub!(:country_select).and_return("<select><option>...</option></select>")
+        builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         builder.should_receive(:country_select).with(:country, priority_countries, {}, {}).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
         
         concat(builder.input(:country, :as => :country))
@@ -81,13 +83,14 @@ describe 'country input' do
     describe "when the attribute is 'country'" do
       
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           builder.stub!(:country_select).and_return(Formtastic::Util.html_safe("<select><option>...</option></select>"))
           concat(builder.input(:country))
         end
       end
       
       it "should render a country input" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag "form li.country"
       end
     end
@@ -95,13 +98,14 @@ describe 'country input' do
     describe "whent the attribute is 'country_something'" do
       
       before do
-        semantic_form_for(@new_post) do |builder|
+        @form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:country_subdivision))
           concat(builder.input(:country_code))
         end
       end
       
       it "should render a country input" do
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag "form li.country"
         output_buffer.should have_tag "form li.string", :count => 2
       end

data/spec/inputs/date_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'date input' do
   
@@ -14,7 +14,7 @@ describe 'date input' do
     
     before do
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :date))
       end
     end
@@ -25,10 +25,12 @@ describe 'date input' do
     it_should_apply_error_logic_for_input_type(:date)
     
     it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset legend.label')
       output_buffer.should have_tag('form li.date fieldset legend.label label')
       output_buffer.should have_tag('form li.date fieldset legend.label label[@for]')
@@ -36,11 +38,13 @@ describe 'date input' do
     end
     
     it 'should have an ordered list of three items inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol')
       output_buffer.should have_tag('form li.date fieldset ol li', :count => 3)
     end
     
     it 'should have three labels for year, month and day' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li label', :count => 3)
       output_buffer.should have_tag('form li.date fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.date fieldset ol li label', /month/i)
@@ -48,6 +52,7 @@ describe 'date input' do
     end
     
     it 'should have three selects for year, month and day' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.date fieldset ol li select', :count => 3)
     end
   end
@@ -59,10 +64,11 @@ describe 'date input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -73,10 +79,11 @@ describe 'date input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Date.new(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -85,10 +92,11 @@ describe 'date input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -97,19 +105,21 @@ describe 'date input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :date, :selected => nil))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
       it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
         
       end
@@ -122,9 +132,10 @@ describe 'date input' do
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -133,9 +144,10 @@ describe 'date input' do
 
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :date, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.date fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f

data/spec/inputs/datetime_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'datetime input' do
   
@@ -19,7 +19,7 @@ describe 'datetime input' do
     
     before do
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
@@ -30,19 +30,23 @@ describe 'datetime input' do
     it_should_apply_error_logic_for_input_type(:datetime)
     
     it 'should have a legend and label with the label text inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label', /Publish at/)
     end
     
     it 'should associate the legend label with the first select' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for="post_publish_at_1i"]')
     end
     
     it 'should have an ordered list of five items inside the fieldset' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol')
       output_buffer.should have_tag('form li.datetime fieldset ol li', :count => 5)
     end
     
     it 'should have five labels for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /year/i)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /month/i)
@@ -52,15 +56,18 @@ describe 'datetime input' do
     end
     
     it 'should have five selects for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
     
     it 'should generate a sanitized label and matching ids for attribute' do
-      semantic_form_for(@new_post) do |builder|
-        builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
+      form = semantic_form_for(@new_post) do |builder|
+        fields = builder.semantic_fields_for(@bob, :index => 10) do |bob_builder|
           concat(bob_builder.input(:created_at, :as => :datetime))
         end
+        concat(fields)
       end
+      output_buffer.concat(form) if Formtastic::Util.rails3?
     
       1.upto(5) do |i|
         output_buffer.should have_tag("form li fieldset ol li label[@for='post_author_10_created_at_#{i}i']")
@@ -72,10 +79,11 @@ describe 'datetime input' do
   describe 'when :discard_input => true is set' do
     it 'should use default attribute value when it is not nil' do
       @new_post.stub!(:publish_at).and_return(Date.new(2007,12,27))
-      semantic_form_for(@new_post) do |builder|
+      form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime, :discard_day => true))
       end
   
+      output_buffer.concat(form) if Formtastic::Util.rails3?
       output_buffer.should have_tag("form li input[@type='hidden'][@value='27']")
     end
   end
@@ -121,7 +129,7 @@ describe 'datetime input' do
         :hour => 'The Hour', :minute => 'The Minute'
       }}
       output_buffer.replace ''
-      semantic_form_for(@new_post) do |builder|
+      @form = semantic_form_for(@new_post) do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
@@ -134,6 +142,7 @@ describe 'datetime input' do
     end
   
     it 'should have translated labels for year, month, day, hour and minute' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Year/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Month/)
       output_buffer.should have_tag('form li.datetime fieldset ol li label', /The Day/)
@@ -145,20 +154,23 @@ describe 'datetime input' do
   describe 'when no object is given' do
     before(:each) do
       output_buffer.replace ''
-      semantic_form_for(:project, :url => 'http://test.host') do |builder|
+      @form = semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end
     end
   
     it 'should have fieldset with legend - classified as a label' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset legend.label', /Publish at/)
     end
   
     it 'should have labels for each input' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => 5)
     end
   
     it 'should have selects for each inputs' do
+      output_buffer.concat(@form) if Formtastic::Util.rails3?
       output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     end
   end
@@ -185,10 +197,11 @@ describe 'datetime input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => Time.mktime(2012))
         with_deprecation_silenced do 
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='2012'][@selected]", :count => 1)
       end
@@ -199,10 +212,11 @@ describe 'datetime input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Date.new(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -211,10 +225,11 @@ describe 'datetime input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => Time.mktime(1999)))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@selected]", :count => 1)
         output_buffer.should have_tag("form li ol li select#post_created_at_1i option[@value='1999'][@selected]", :count => 1)
       end
@@ -223,19 +238,21 @@ describe 'datetime input' do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
         with_deprecation_silenced do
-          semantic_form_for(@new_post) do |builder|
+          @form = semantic_form_for(@new_post) do |builder|
             concat(builder.input(:created_at, :as => :datetime, :selected => nil))
           end
         end
+        output_buffer.concat(@form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select#post_created_at_1i option[@selected]")
       end
       
       it "should select nothing if a :selected is not provided" do
         output_buffer.replace ''
         @new_post.stub!(:created_at => nil)
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should_not have_tag("form li ol li select option[@selected]")
       end
     end
@@ -256,9 +273,10 @@ describe 'datetime input' do
     fields.each do |field|
       it "should replace the #{field} label with the specified text if :labels[:#{field}] is set" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "another #{field} label" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
@@ -267,9 +285,10 @@ describe 'datetime input' do
   
       it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
         output_buffer.replace ''
-        semantic_form_for(@new_post) do |builder|
+        form = semantic_form_for(@new_post) do |builder|
           concat(builder.input(:created_at, :as => :datetime, :labels => { field => "" }))
         end
+        output_buffer.concat(form) if Formtastic::Util.rails3?
         output_buffer.should have_tag('form li.datetime fieldset ol li label', :count => fields.length-1)
         fields.each do |f|
           output_buffer.should have_tag('form li.datetime fieldset ol li label', /#{f}/i) unless field == f

data/spec/inputs/file_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'file input' do
   
@@ -9,7 +9,7 @@ describe 'file input' do
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
     end
   end
@@ -23,9 +23,10 @@ describe 'file input' do
   it_should_apply_error_logic_for_input_type(:file)
 
   it 'should use input_html to style inputs' do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input.myclass")
   end
 

data/spec/inputs/hidden_input_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'hidden input' do
   
@@ -9,7 +9,7 @@ describe 'hidden input' do
     @output_buffer = ''
     mock_everything
     
-    semantic_form_for(@new_post) do |builder|
+    @form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
       concat(builder.input(:author_id, :as => :hidden, :value => 99))
       concat(builder.input(:published, :as => :hidden, :input_html => {:value => true}))
@@ -23,25 +23,30 @@ describe 'hidden input' do
   it_should_not_have_a_label
 
   it "should generate a input field" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_secret")
     output_buffer.should have_tag("form li input#post_secret[@type=\"hidden\"]")
     output_buffer.should have_tag("form li input#post_secret[@name=\"post[secret]\"]")
   end
   
   it "should pass any explicitly specified value - using :value" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
   end
   
   # Handle Formtastic :input_html options for consistency.
   it "should pass any explicitly specified value - using :input_html options" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
+    output_buffer.concat(@form) if Formtastic::Util.rails3?
     output_buffer.should have_tag("form li input#post_author[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
   
@@ -50,19 +55,21 @@ describe 'hidden input' do
     @errors.stub!(:[]).with(:secret).and_return(["foo", "bah"])
     @new_post.stub!(:errors).and_return(@errors)
     
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
     end
     
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li p.inline-errors")
     output_buffer.should_not have_tag("form li ul.errors")
   end
 
   it "should not render inline hints" do
-    semantic_form_for(@new_post) do |builder|
+    form = semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden, :hint => "all your base are belong to use"))
     end
 
+    output_buffer.concat(form) if Formtastic::Util.rails3?
     output_buffer.should_not have_tag("form li p.inline-hints")
     output_buffer.should_not have_tag("form li ul.hints")
   end