formtastic-bootstrap 1.2.0 → 2.0.0

data/spec/inputs/radio_input_spec.rb

@@ -8,7 +8,6 @@ describe 'radio input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
   end
 
   describe 'for belongs_to association' do
@@ -18,64 +17,55 @@ describe 'radio input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("radio")
-    it_should_have_input_wrapper_with_class(:clearfix)
-    it_should_have_input_class_in_the_right_place
+    it_should_have_bootstrap_horizontal_wrapping
+    it_should_have_input_wrapper_with_class("radio_buttons")
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_id("post_author_input")
-    it_should_have_a_nested_div
-    it_should_have_a_nested_div_with_class('choices.input')
-    it_should_have_a_nested_unordered_list_with_class('choices-group.inputs-list')
-    it_should_apply_error_logic_for_input_type(:radio, :block)
+    # it_should_have_a_nested_fieldset
+    # it_should_have_a_nested_fieldset_with_class('choices')
+    # it_should_have_a_nested_ordered_list_with_class('choices-group')
+    it_should_apply_error_logic_for_input_type(:radio)
     it_should_use_the_collection_when_provided(:radio, 'input')
 
-    it 'should generate a \'legend\' containing a label with text for the input' do
-      output_buffer.should have_tag('form div.clearfix label')
-      output_buffer.should have_tag('form div.clearfix label', /Author/)
-    end
-
-    it 'should not link the \'legend\' label to any input' do
-      output_buffer.should_not have_tag('form div.clearfix > label[@for]')
-    end
-
-    it 'should generate an unordered list with a list item for each choice' do
-      output_buffer.should have_tag('form div.clearfix div.input ul')
-      output_buffer.should have_tag('form div.clearfix div.input ul li.choice', :count => ::Author.all.size)
+    it 'should generate a control label with text for the input' do
+      output_buffer.should have_tag('form div.control-group > label.control-label')
+      output_buffer.should have_tag('form div.control-group > label.control-label', /Author/)
     end
 
     it 'should have one option with a "checked" attribute' do
-      output_buffer.should have_tag('form ul input[@checked]', :count => 1)
+      output_buffer.should have_tag('form div.control-group div.controls input[@checked]', :count => 1)
     end
 
     describe "each choice" do
-      
+
       it 'should not give the choice label the .label class' do
-        output_buffer.should_not have_tag('li.choice label.label')
+        output_buffer.should_not have_tag('div.controls label.label')
       end
-      
+
       it 'should not add the required attribute to each input' do
-        output_buffer.should_not have_tag('li.choice input[@required]')
+        output_buffer.should_not have_tag('div.controls input[@required]')
       end
-      
-      
+
+
       it 'should contain a label for the radio input with a nested input and label text' do
         ::Author.all.each do |author|
-          output_buffer.should have_tag('form div.clearfix div.input ul li label', /#{author.to_label}/)
-          output_buffer.should have_tag("form div.clearfix div.input ul li label[@for='post_author_id_#{author.id}']")
+          output_buffer.should have_tag('form div.control-group div.controls label', /#{author.to_label}/)
+          output_buffer.should have_tag("form div.control-group div.controls label[@for='post_author_id_#{author.id}']")
         end
       end
 
       it 'should use values as li.class when value_as_class is true' do
         ::Author.all.each do |author|
-          output_buffer.should have_tag("form div.clearfix ul li.author_#{author.id} label")
+          output_buffer.should have_tag("form div.control-group div.controls label.author_#{author.id}")
         end
       end
 
       it "should have a radio input" do
         ::Author.all.each do |author|
-          output_buffer.should have_tag("form div.clearfix div.input ul li label input#post_author_id_#{author.id}")
-          output_buffer.should have_tag("form div.clearfix div.input ul li label input[@type='radio']")
-          output_buffer.should have_tag("form div.clearfix div.input ul li label input[@value='#{author.id}']")
-          output_buffer.should have_tag("form div.clearfix div.input ul li label input[@name='post[author_id]']")
+          output_buffer.should have_tag("form div.control-group div.controls label input#post_author_id_#{author.id}")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@type='radio']")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@value='#{author.id}']")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@name='post[author_id]']")
         end
       end
 
@@ -88,7 +78,7 @@ describe 'radio input' do
           concat(builder.input(:author, :as => :radio))
         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 mark the input as disabled if options attached for disabling" do
@@ -96,8 +86,8 @@ describe 'radio input' do
           concat(builder.input(:author, :as => :radio, :collection => [["Test", 'test'], ["Try", "try", {:disabled => true}]]))
         end)
 
-        output_buffer.should_not have_tag("form div.clearfix div.input ul li label input[@value='test'][@disabled='disabled']")
-        output_buffer.should have_tag("form div.clearfix div.input ul li label input[@value='try'][@disabled='disabled']")
+        output_buffer.should_not have_tag("form div.control-group div.controls label input[@value='test'][@disabled='disabled']")
+        output_buffer.should have_tag("form div.control-group div.controls label input[@value='try'][@disabled='disabled']")
       end
 
       it "should not contain invalid HTML attributes" do
@@ -106,7 +96,7 @@ describe 'radio input' do
           concat(builder.input(:author, :as => :radio))
         end)
 
-        output_buffer.should_not have_tag("form div.clearfix div.input ul li input[@find_options]")
+        output_buffer.should_not have_tag("form li fieldset ol li input[@find_options]")
       end
 
     end
@@ -119,18 +109,10 @@ describe 'radio input' do
         end)
       end
 
-      it 'should generate a div with a label' do
-        output_buffer.should have_tag('form div.clearfix label', /Author/)
-      end
-
-      it 'should generate an li tag for each item in the collection' do
-        output_buffer.should have_tag('form div.clearfix div ul li', :count => ::Author.all.size)
-      end
-
       it 'should generate labels for each item' do
         ::Author.all.each do |author|
-          output_buffer.should have_tag('form div div ul li label', /#{author.to_label}/)
-          output_buffer.should have_tag("form div div ul li label[@for='project_author_id_#{author.id}']")
+          output_buffer.should have_tag('form div.control-group div.controls label', /#{author.to_label}/)
+          output_buffer.should have_tag("form div.control-group div.controls label[@for='project_author_id_#{author.id}']")
         end
       end
 
@@ -138,18 +120,17 @@ describe 'radio input' do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_id, :as => :radio, :collection => [["<b>Item 1</b>", 1], ["<b>Item 2</b>", 2]]))
         end)
-        output_buffer.should have_tag('form div div ul li label') do |label|
-          # label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
-          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;/
+        output_buffer.should have_tag('form div.control-group div.controls label') do |label|
+          label.body.should match /&lt;b&gt;Item [12]&lt;\/b&gt;$/
         end
       end
 
       it 'should generate inputs for each item' do
         ::Author.all.each do |author|
-          output_buffer.should have_tag("form div div ul li label input#project_author_id_#{author.id}")
-          output_buffer.should have_tag("form div div ul li label input[@type='radio']")
-          output_buffer.should have_tag("form div div ul li label input[@value='#{author.id}']")
-          output_buffer.should have_tag("form div div ul li label input[@name='project[author_id]']")
+          output_buffer.should have_tag("form div.control-group div.controls label input#project_author_id_#{author.id}")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@type='radio']")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@value='#{author.id}']")
+          output_buffer.should have_tag("form div.control-group div.controls label input[@name='project[author_id]']")
         end
       end
     end
@@ -173,7 +154,7 @@ describe 'radio input' do
     end
 
     it "should do foo" do
-      output_buffer.should have_tag("div.clearfix > label", /Translated/)
+      output_buffer.should have_tag("label.control-label", /Translated/)
     end
 
   end
@@ -187,7 +168,7 @@ describe 'radio input' do
     end
 
     it "should output the correct label title" do
-      output_buffer.should have_tag("div.clearfix > label", /The authors/)
+      output_buffer.should have_tag("label.control-label", /The authors/)
     end
   end
 
@@ -201,10 +182,11 @@ describe 'radio input' do
     end
 
     it "should not output the legend" do
-      output_buffer.should_not have_tag("legend.label")
+      # TODO I think this is not supported in FB.
+      output_buffer.should_not have_tag("label.control-label")
       output_buffer.should_not include("&gt;")
     end
-    
+
     it "should not cause escaped HTML" do
       output_buffer.should_not include("&gt;")
     end
@@ -219,7 +201,7 @@ describe 'radio input' do
     end
 
     it "should output the correct label title" do
-      output_buffer.should have_tag("div.clearfix label abbr")
+      output_buffer.should have_tag("label.control-label abbr")
     end
   end
 
@@ -237,4 +219,49 @@ describe 'radio input' do
     it_should_have_input_wrapper_with_id("custom_prefix_post_authors_input")
   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 => :radio))
+        end)
+      end)
+    end
+
+    it 'should index the id of the control-group' do
+      output_buffer.should have_tag("div.control-group#post_author_attributes_3_name_input")
+    end
+
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name_true")
+      output_buffer.should have_tag("input#post_author_attributes_3_name_false")
+    end
+
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+
+  end
+
+  describe "when collection contains integers" do
+    before do
+      @output_buffer = ''
+      mock_everything
+
+      concat(semantic_form_for(:project) do |builder|
+        concat(builder.input(:author_id, :as => :radio, :collection => [1, 2, 3]))
+      end)
+    end
+
+    it 'should output the correct labels' do
+      output_buffer.should have_tag("div.controls label", /1/)
+      output_buffer.should have_tag("div.controls label", /2/)
+      output_buffer.should have_tag("div.controls label", /3/)
+    end
+  end
+
 end

data/spec/inputs/range_input_spec.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'spec_helper'
-require 'active_record'
 
 describe 'range input' do
 
@@ -9,7 +8,6 @@ describe 'range input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
   end
 
   describe "when object is provided" do
@@ -19,10 +17,11 @@ describe 'range input' do
       end)
     end
 
+    it_should_have_bootstrap_horizontal_wrapping
     it_should_have_input_wrapper_with_class(:range)
-    it_should_have_input_wrapper_with_class(:clearfix)
-    it_should_have_input_wrapper_with_class(:stringish) # might be removed
-    it_should_have_input_class_in_the_right_place
+    it_should_have_input_wrapper_with_class(:input)
+    it_should_have_input_wrapper_with_class(:numeric)
+    it_should_have_input_wrapper_with_class(:stringish)
     it_should_have_input_wrapper_with_id("author_age_input")
     it_should_have_label_with_text(/Age/)
     it_should_have_label_for("author_age")
@@ -44,6 +43,34 @@ describe 'range input' do
     it_should_have_label_and_input_with_id("context2_author_age")
 
   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 => :range))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the control-group' do
+      output_buffer.should have_tag("div.control-group#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
 
   describe "when validations require a minimum value (:greater_than)" do
     before do

data/spec/inputs/search_input_spec.rb

@@ -8,7 +8,6 @@ describe 'search input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
   end
 
   describe "when object is provided" do
@@ -18,10 +17,10 @@ describe 'search input' do
       end)
     end
 
+    it_should_have_bootstrap_horizontal_wrapping
     it_should_have_input_wrapper_with_class(:search)
-    it_should_have_input_wrapper_with_class(:clearfix)
+    it_should_have_input_wrapper_with_class(:input)
     it_should_have_input_wrapper_with_class(:stringish)
-    it_should_have_input_class_in_the_right_place
     it_should_have_input_wrapper_with_id("post_search_input")
     it_should_have_label_with_text(/Search/)
     it_should_have_label_for("post_search")
@@ -44,6 +43,33 @@ describe 'search input' do
 
   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 => :search))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the control-group' do
+      output_buffer.should have_tag("div.control-group#post_author_attributes_3_name_input")
+    end
+    
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_name")
+    end
+    
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][name]']")
+    end
+    
+  end
+  
   describe "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do