formtastic-bootstrap 1.2.0 → 2.0.0

data/spec/helpers/inputs_helper_spec.rb

@@ -1,14 +1,13 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe 'Formtastic::FormBuilder#inputs' do
+describe 'FormtasticBootstrap::FormBuilder#inputs' do
 
   include FormtasticSpecHelper
 
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
   end
 
   describe 'with a block (block forms syntax)' do
@@ -33,13 +32,11 @@ describe 'Formtastic::FormBuilder#inputs' do
       end
   
       it 'should not render an ol inside the fieldset' do
-        # output_buffer.should have_tag("form fieldset.inputs ol")
         output_buffer.should_not have_tag("form fieldset.inputs ol")
       end
   
-      it 'should render the contents of the block inside the fieldset' do
-        # output_buffer.should have_tag("form fieldset.inputs ol", /hello/)
-        output_buffer.should have_tag("form fieldset.inputs", /hello/)
+      it 'should not render the contents of the block inside the ol' do
+        output_buffer.should_not have_tag("form fieldset.inputs ol", /hello/)
       end
   
       it 'should not render a legend inside the fieldset' do
@@ -125,6 +122,18 @@ describe 'Formtastic::FormBuilder#inputs' do
           output_buffer.should have_tag("form input[@name='post[authors_attributes][1][login]']")
           output_buffer.should_not have_tag('form fieldset[@name]')
         end
+        
+        it 'should include an indexed :label input for each item' do
+          concat(semantic_form_for(@new_post) do |post|
+            post.inputs :for => :authors do |author, index|
+              concat(author.input(:login, :label => "#{index}", :required => false))
+            end
+          end)
+          
+          output_buffer.should have_tag("form fieldset.inputs label", "1", :count => 1)
+          output_buffer.should have_tag("form fieldset.inputs label", "2", :count => 1)
+          output_buffer.should_not have_tag('form fieldset legend')
+        end
       end
   
       describe 'as an array containing the a symbole for the association name and the associated object' do
@@ -176,7 +185,7 @@ describe 'Formtastic::FormBuilder#inputs' do
           concat(inputs)
         end)
   
-        output_buffer.should have_tag('form fieldset div.clearfix div.input #post_author_attributes_10_login')
+        output_buffer.should have_tag('form fieldset #post_author_attributes_10_login')
       end
   
       it 'should not add builder as a fieldset attribute tag' do
@@ -190,7 +199,7 @@ describe 'Formtastic::FormBuilder#inputs' do
         output_buffer.should_not have_tag('fieldset[@builder="Formtastic::Helpers::FormHelper"]')
       end
   
-      it 'should send parent_builder as an option to allow child index interpolation' do
+      it 'should send parent_builder as an option to allow child index interpolation for legends' do
         concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', 0)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
@@ -202,7 +211,7 @@ describe 'Formtastic::FormBuilder#inputs' do
         output_buffer.should have_tag('fieldset legend', 'Author #1')
       end
   
-      it 'should also provide child index interpolation when nested child index is a hash' do
+      it 'should also provide child index interpolation for legends when nested child index is a hash' do
         concat(semantic_form_for(@new_post) do |builder|
           builder.instance_variable_set('@nested_child_index', :author => 10)
           inputs = builder.inputs :for => [:author, @bob], :name => 'Author #%i' do |bob_builder|
@@ -213,6 +222,30 @@ describe 'Formtastic::FormBuilder#inputs' do
   
         output_buffer.should have_tag('fieldset legend', 'Author #11')
       end
+      
+      it 'should send parent_builder as an option to allow child index interpolation for labels' do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.instance_variable_set('@nested_child_index', 'post[author_attributes]' => 0)
+          inputs = builder.inputs :for => [:author, @bob] do |bob_builder, index|
+            concat(bob_builder.input(:name, :label => "Author ##{index}", :required => false))
+          end
+          concat(inputs)
+        end)
+        
+        output_buffer.should have_tag('fieldset label', 'Author #1')
+      end
+      
+      it 'should also provide child index interpolation for labels when nested child index is a hash' do
+        concat(semantic_form_for(@new_post) do |builder|
+          builder.instance_variable_set('@nested_child_index', 'post[author_attributes]' => 10)
+          inputs = builder.inputs :for => [:author, @bob] do |bob_builder, index|
+            concat(bob_builder.input(:name, :label => "Author ##{index}", :required => false))
+          end
+          concat(inputs)
+        end)
+        
+        output_buffer.should have_tag('fieldset label', 'Author #11')
+      end
     end
   
     describe 'when a :name or :title option is provided' do
@@ -346,26 +379,26 @@ describe 'Formtastic::FormBuilder#inputs' do
         output_buffer.should_not have_tag('form > fieldset.inputs > ol')
       end
   
-      it 'should render a div item in the ol for each column and reflection' do
+      it 'should not render a list item in the ol for each column and reflection' do
         # Remove the :has_many macro and :created_at column
         count = ::Post.content_columns.size + ::Post.reflections.size - 2
-        output_buffer.should have_tag('form > fieldset.inputs > div.clearfix', :count => count)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li', :count => count)
       end
   
-      it 'should render a string list item for title' do
-        output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.string')
+      it 'should not render a string list item for title' do
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.string')
       end
-
-      it 'should render a text list item for body' do
-        output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.text')
+  
+      it 'should not render a text list item for body' do
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.text')
       end
   
-      it 'should render a select list item for author_id' do
-        output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.select', :count => 1)
+      it 'should not render a select list item for author_id' do
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.select', :count => 1)
       end
   
       it 'should not render timestamps inputs by default' do
-        output_buffer.should_not have_tag('form > fieldset.inputs > div.clearfix.datetime')
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.datetime')
       end
     
       context "with a polymorphic association" do
@@ -397,9 +430,12 @@ describe 'Formtastic::FormBuilder#inputs' do
             concat(builder.inputs(:title, :body))
           end)
   
-          output_buffer.should have_tag('form > fieldset.inputs > div.clearfix', :count => 2)
-          output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.string')
-          output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.text')
+          output_buffer.should have_tag('form > fieldset.inputs input', :count => 1)
+          output_buffer.should have_tag('form > fieldset.inputs textarea', :count => 1)
+
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li', :count => 2)
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.string')
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.text')
         end
       end
   
@@ -409,7 +445,9 @@ describe 'Formtastic::FormBuilder#inputs' do
             concat(builder.inputs(:title, :body))
           end)
   
-          output_buffer.should have_tag('form > fieldset.inputs > div.clearfix.string', :count => 2)
+          output_buffer.should have_tag('form > fieldset.inputs input', :count => 2)
+
+          output_buffer.should_not have_tag('form > fieldset.inputs > ol > li.string')
         end
       end
       
@@ -472,8 +510,9 @@ describe 'Formtastic::FormBuilder#inputs' do
         end)
       end
   
-      it 'should render a form with a fieldset containing two list items' do
-        output_buffer.should have_tag('form > fieldset.inputs > div.clearfix', :count => 4)
+      it 'should not render a form with a fieldset containing two list items' do
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li', :count => 4)
+        output_buffer.should_not have_tag('form > fieldset.inputs input', :count => 4)
       end
   
       it 'should pass the options down to the fieldset' do
@@ -508,6 +547,7 @@ describe 'Formtastic::FormBuilder#inputs' do
             end)
           end)
         end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
         output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs')
       end
     end
@@ -520,6 +560,7 @@ describe 'Formtastic::FormBuilder#inputs' do
             end)
           end)
         end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
         output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs')
       end
     end
@@ -531,6 +572,7 @@ describe 'Formtastic::FormBuilder#inputs' do
             concat(builder.inputs(:title))
           end)
         end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
         output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs')
       end
     end
@@ -542,6 +584,7 @@ describe 'Formtastic::FormBuilder#inputs' do
             concat(builder.inputs(:name, :for => :author))
           end)
         end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
         output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs')
       end
     end
@@ -556,9 +599,25 @@ describe 'Formtastic::FormBuilder#inputs' do
             end)
           end)
         end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol > li > fieldset.inputs > ol')
         output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs > fieldset.inputs')
       end
     end
+
+    context "when several are nested" do
+      it "should wrap each of the nested inputs in an li block to maintain HTML validity" do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.inputs do
+            concat(builder.inputs do
+            end)
+            concat(builder.inputs do
+            end)
+          end)
+        end)
+        output_buffer.should_not have_tag('form > fieldset.inputs > ol > li > fieldset.inputs > ol')
+        output_buffer.should have_tag('form > fieldset.inputs > fieldset.inputs', :count => 2)
+      end
+    end
     
   end
 

data/spec/inputs/boolean_input_spec.rb

@@ -8,149 +8,152 @@ describe 'boolean input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end)
   end
 
+  it_should_have_bootstrap_horizontal_wrapping
+  it_should_have_bootstrap_controls_label_with("checkbox")
   it_should_have_input_wrapper_with_class("boolean")
-  it_should_have_input_wrapper_with_class(:clearfix)
-  it_should_have_input_class_in_the_right_place
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_allow_comments_input")
-  it_should_apply_error_logic_for_input_type(:boolean, :block)
-
+  it_should_apply_error_logic_for_input_type(:boolean)
+  
   it 'should generate a label containing the input' do
     output_buffer.should_not have_tag('label.label')
-    
-    
-    output_buffer.should have_tag('form div.clearfix div.input ul li label', :count => 1)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label[@for="post_allow_comments"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label', /Allow comments/)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"]', :count => 1)
-    output_buffer.should have_tag('form div.clearfix input[@type="hidden"]', :count => 1)
-    output_buffer.should_not have_tag('form div.clearfix label input[@type="hidden"]', :count => 1) # invalid HTML5
-  end
-
+    output_buffer.should have_tag('form div.control-group div.controls label', :count => 1)
+    output_buffer.should have_tag('form div.control-group div.controls label.checkbox', :count => 1)
+    output_buffer.should have_tag('form div.control-group div.controls label[@for="post_allow_comments"]')
+    output_buffer.should have_tag('form div.control-group div.controls label', /Allow comments/)
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"]', :count => 1)
+    output_buffer.should have_tag('form div.control-group input[@type="hidden"]', :count => 1)
+    output_buffer.should_not have_tag('form div.control-group div.controls label input[@type="hidden"]', :count => 1) # invalid HTML5
+  end
+  
+  it 'should not add a "name" attribute to the label' do
+    output_buffer.should_not have_tag('form div.control-group div.controls label[@name]')
+  end
+  
   it 'should generate a checkbox input' do
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input#post_allow_comments')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@name="post[allow_comments]"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"][@value="1"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input')
+    output_buffer.should have_tag('form div.control-group div.controls label input#post_allow_comments')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@name="post[allow_comments]"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="1"]')
   end
-
+  
   it 'should generate a checked input if object.method returns true' do
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@checked="checked"]')
-    output_buffer.should have_tag('form div.clearfix input[@name="post[allow_comments]"]', :count => 2)
-    output_buffer.should have_tag('form div.clearfix div.input ul li input#post_allow_comments', :count => 1)
+    output_buffer.should have_tag('form div.control-group div.controls label input[@checked="checked"]')
+    output_buffer.should have_tag('form div.control-group input[@name="post[allow_comments]"]', :count => 2)
+    output_buffer.should have_tag('form div.control-group div.controls input#post_allow_comments', :count => 1)
   end
-
+  
   it 'should generate a checked input if :input_html is passed :checked => checked' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => {:checked => 'checked'}))
     end)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@checked="checked"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@checked="checked"]')
   end
-
+  
   it 'should name the hidden input with the :name html_option' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li input[@type="checkbox"][@name="foo"]', :count => 1)
-    output_buffer.should have_tag('form div.clearfix input[@type="hidden"][@name="foo"]', :count => 1)
+  
+    output_buffer.should have_tag('form div.control-group input[@type="checkbox"][@name="foo"]', :count => 1)
+    output_buffer.should have_tag('form div.control-group input[@type="hidden"][@name="foo"]', :count => 1)
   end
-
+  
   it 'should name the hidden input with the :name html_option' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:answer_comments, :as => :boolean, :input_html => { :name => "foo" }))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li input[@type="checkbox"][@name="foo"]', :count => 1)
-    output_buffer.should have_tag('form div.clearfix input[@type="hidden"][@name="foo"]', :count => 1)
+  
+    output_buffer.should have_tag('form div.control-group input[@type="checkbox"][@name="foo"]', :count => 1)
+    output_buffer.should have_tag('form div.control-group input[@type="hidden"][@name="foo"]', :count => 1)
   end
 
   it "should generate a disabled input and hidden input if :input_html is passed :disabled => 'disabled' " do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:disabled => 'disabled'}))
     end)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@disabled="disabled"]', :count => 1)
-    output_buffer.should have_tag('form div.clearfix input[@type="hidden"][@disabled="disabled"]', :count => 1)
+    output_buffer.should have_tag('form div.control-group label.checkbox input[@disabled="disabled"]', :count => 1)
+    output_buffer.should have_tag('form div.control-group input[@type="hidden"][@disabled="disabled"]', :count => 1)
   end
 
   it 'should generate an input[id] with matching label[for] when id passed in :input_html' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :input_html => {:id => 'custom_id'}))
     end)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@id="custom_id"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label[@for="custom_id"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@id="custom_id"]')
+    output_buffer.should have_tag('form div.control-group div.controls label[@for="custom_id"]')
   end
-
+  
   it 'should allow checked and unchecked values to be sent' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'checked', :unchecked_value => 'unchecked'))
     end)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
-    output_buffer.should have_tag('form div.clearfix input[@type="hidden"][@value="unchecked"]')
-    output_buffer.should_not have_tag('form div.clearfix label input[@type="hidden"]') # invalid HTML5
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="checked"]:not([@unchecked_value][@checked_value])')
+    output_buffer.should have_tag('form div.control-group input[@type="hidden"][@value="unchecked"]')
+    output_buffer.should_not have_tag('form div.control-group div.controls label input[@type="hidden"]') # invalid HTML5
   end
-
+  
   it 'should generate a checked input if object.method returns checked value' do
     @new_post.stub!(:allow_comments).and_return('yes')
-
+  
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-
-    output_buffer.should have_tag('form li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
+  
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
-
+  
   it 'should not generate a checked input if object.method returns unchecked value' do
     @new_post.stub!(:allow_comments).and_return('no')
-
+  
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"][@value="yes"]:not([@checked])')
+  
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="yes"]:not([@checked])')
   end
-
+  
   it 'should generate a checked input if object.method returns checked value' do
     @new_post.stub!(:allow_comments).and_return('yes')
-
+  
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"][@value="yes"][@checked="checked"]')
+  
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="yes"][@checked="checked"]')
   end
-
+  
   it 'should not generate a checked input if object.method returns unchecked value' do
     @new_post.stub!(:allow_comments).and_return('no')
-
+  
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:allow_comments, :as => :boolean, :checked_value => 'yes', :unchecked_value => 'no'))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"][@value="yes"]:not([@checked])')
+  
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"][@value="yes"]:not([@checked])')
   end
-
+  
   it 'should generate a label and a checkbox even if no object is given' do
     concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
       concat(builder.input(:allow_comments, :as => :boolean))
     end)
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li label[@for="project_allow_comments"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label', /Allow comments/)
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"]')
-
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input#project_allow_comments')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@type="checkbox"]')
-    output_buffer.should have_tag('form div.clearfix div.input ul li label input[@name="project[allow_comments]"]')
-  end
-
+  
+    output_buffer.should have_tag('form div.control-group div.controls label[@for="project_allow_comments"]')
+    output_buffer.should have_tag('form div.control-group div.controls label', /Allow comments/)
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"]')
+  
+    output_buffer.should have_tag('form div.control-group div.controls label input#project_allow_comments')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@type="checkbox"]')
+    output_buffer.should have_tag('form div.control-group div.controls label input[@name="project[allow_comments]"]')
+  end
+  
   context "when required" do
     
     it "should add the required attribute to the input's html options" do
@@ -172,22 +175,52 @@ describe 'boolean input' do
     end
     
   end
-
+  
   describe "when namespace is provided" do
-
+  
     before do
       @output_buffer = ''
       mock_everything
-      Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
-
+  
       concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:allow_comments, :as => :boolean))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_id("context2_post_allow_comments_input")
     it_should_have_an_inline_label_for("context2_post_allow_comments")
-
+  
+  end
+  
+  describe "when index is provided" do
+  
+    before do
+      @output_buffer = ''
+      mock_everything
+  
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:name, :as => :boolean))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("div#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the input tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the hidden input' do
+      output_buffer.should have_tag("input[@type='hidden'][@name='post[author_attributes][3][name]']")
+    end
+  
+    it 'should index the name of the checkbox input' do
+      output_buffer.should have_tag("input[@type='checkbox'][@name='post[author_attributes][3][name]']")
+    end
+    
   end
 
 end