speedo-formstrap 1.2.0 → 1.2.1

data/spec/inputs/search_input_spec.rb

@@ -8,7 +8,7 @@ describe 'search input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe "when object is provided" do
@@ -18,8 +18,8 @@ describe 'search input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class('search-wrapper')
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class(:search)
+    it_should_have_input_wrapper_with_class(:clearfix)
     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")
@@ -43,37 +43,10 @@ describe 'search input' do
     it_should_have_label_and_input_with_id("context2_post_search")
 
   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 wrapper' do
-      output_buffer.should have_tag("div#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
+      with_config :use_required_attribute, true do 
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :search, :required => true))
         end)
@@ -81,6 +54,6 @@ describe 'search input' do
       end
     end
   end
-
+  
 end
 

data/spec/inputs/select_input_spec.rb

@@ -8,7 +8,7 @@ describe 'select input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe 'explicit values' do
@@ -24,10 +24,10 @@ describe 'select input' do
 
       it 'should have a option for each key and/or value' do
         @array_with_values.each do |v|
-          output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{v}']", /^#{v}$/)
+          output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{v}']", /^#{v}$/)
         end
         @array_with_keys_and_values.each do |v|
-          output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{v.second}']", /^#{v.first}$/)
+          output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{v.second}']", /^#{v.first}$/)
         end
       end
     end
@@ -41,9 +41,9 @@ describe 'select input' do
       end
 
       it 'should draw select options' do
-        output_buffer.should have_tag('form div.control-group div.controls select')
-        output_buffer.should have_tag('form div.control-group div.controls select#post_reviewer_id')
-        output_buffer.should_not have_tag('form div.control-group div.controls select#post_mongoid_reviewer_id')
+        output_buffer.should have_tag('form div.clearfix div.input select')
+        output_buffer.should have_tag('form div.clearfix div.input select#post_reviewer_id')
+        output_buffer.should_not have_tag('form div.clearfix div.input select#post_mongoid_reviewer_id')
       end
     end
 
@@ -57,7 +57,7 @@ describe 'select input' do
 
       it 'should have an option for each value' do
         @range_with_values.each do |v|
-          output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{v}']", /^#{v}$/)
+          output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{v}']", /^#{v}$/)
         end
       end
     end
@@ -72,20 +72,10 @@ describe 'select input' do
 
       it 'should render select options using provided HTML string' do
         2.times do |v|
-          output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{v}']", /^#{v}$/)
+          output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{v}']", /^#{v}$/)
         end
       end
     end
-
-    describe 'using a nil name' do
-      before do
-        concat(semantic_form_for(@new_post) do |builder|
-          concat(builder.input(:title, :as => :select, :collection => [], :input_html => {:name => nil}))
-        end)
-      end
-
-      it_should_have_select_with_name("post[title]")
-    end
   end
 
   describe 'for boolean columns' do
@@ -94,20 +84,19 @@ describe 'select input' do
     #     # Note: Works, but something like Formtastic.root.join(...) would probably be "safer".
     #     ::I18n.load_path = [File.join(File.dirname(__FILE__), *%w[.. .. lib locale en.yml])]
     #     ::I18n.backend.send(:init_translations)
-    #
+    # 
     #     concat(semantic_form_for(@new_post) do |builder|
     #       concat(builder.input(:published, :as => :select))
     #     end)
     #   end
-    #
+    # 
     #   after do
-    #     ::I18n.load_path = []
     #     ::I18n.backend.store_translations :en, {}
     #   end
-    #
+    # 
     #   it 'should render a select with at least options: true/false' do
-    #     output_buffer.should have_tag("form div.control-group div.controls select option[@value='true']", /^Yes$/)
-    #     output_buffer.should have_tag("form div.control-group div.controls select option[@value='false']", /^No$/)
+    #     output_buffer.should have_tag("form div.clearfix div.input select option[@value='true']", /^Yes$/)
+    #     output_buffer.should have_tag("form div.clearfix div.input select option[@value='false']", /^No$/)
     #   end
     # end
 
@@ -126,8 +115,8 @@ describe 'select input' do
       end
 
       it 'should render a select with at least options: true/false' do
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='false']", /#{@boolean_select_labels[:no]}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='true']", /#{@boolean_select_labels[:yes]}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='false']", /#{@boolean_select_labels[:no]}/)
       end
     end
   end
@@ -140,8 +129,8 @@ describe 'select input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("select-wrapper")
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class("select")
+    it_should_have_input_wrapper_with_class(:clearfix)
     it_should_have_input_class_in_the_right_place
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
@@ -151,42 +140,38 @@ describe 'select input' do
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.should have_tag('form div.control-group div.controls select')
-      output_buffer.should have_tag('form div.control-group div.controls select#post_author_id')
-      output_buffer.should have_tag('form div.control-group div.controls select#post_reviewer_id')
+      output_buffer.should have_tag('form div.clearfix div.input select')
+      output_buffer.should have_tag('form div.clearfix div.input select#post_author_id')
+      output_buffer.should have_tag('form div.clearfix div.input select#post_reviewer_id')
     end
 
     it 'should have a valid name' do
-      output_buffer.should have_tag("form div.control-group div.controls select[@name='post[author_id]']")
-      output_buffer.should_not have_tag("form div.control-group div.controls select[@name='post[author_id][]']")
-      output_buffer.should_not have_tag("form div.control-group div.controls select[@name='post[reviewer_id][]']")
+      output_buffer.should have_tag("form div.clearfix div.input select[@name='post[author_id]']")
+      output_buffer.should_not have_tag("form div.clearfix div.input select[@name='post[author_id][]']")
+      output_buffer.should_not have_tag("form div.clearfix div.input select[@name='post[reviewer_id][]']")
     end
 
     it 'should not create a multi-select' do
-      output_buffer.should_not have_tag('form div.control-group div.controls select[@multiple]')
-    end
-
-    it 'should not add a hidden input' do
-      output_buffer.should_not have_tag("form div.control-group div.controls input[@type='hidden']")
+      output_buffer.should_not have_tag('form div.clearfix div.input select[@multiple]')
     end
 
     it 'should create a select without size' do
-      output_buffer.should_not have_tag('form div.control-group div.controls select[@size]')
+      output_buffer.should_not have_tag('form div.clearfix div.input select[@size]')
     end
 
     it 'should have a blank option' do
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.should have_tag("form div.control-group div.controls select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
+      output_buffer.should have_tag("form div.clearfix div.input select[@name='post[author_id]'] option", :count => ::Author.all.size + 1)
       ::Author.all.each do |author|
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{author.id}']", /#{author.to_label}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
 
     it 'should have one option with a "selected" attribute (bob)' do
-      output_buffer.should have_tag("form div.control-group div.controls select[@name='post[author_id]'] option[@selected]", :count => 1)
+      output_buffer.should have_tag("form div.clearfix div.input select[@name='post[author_id]'] option[@selected]", :count => 1)
     end
 
     it 'should not singularize the association name' do
@@ -198,7 +183,7 @@ describe 'select input' do
         concat(builder.input(:author_status, :as => :select))
       end)
 
-      output_buffer.should have_tag('form div.control-group div.controls select#post_author_status_id')
+      output_buffer.should have_tag('form div.clearfix div.input select#post_author_status_id')
     end
   end
 
@@ -268,7 +253,7 @@ describe 'select input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("select-wrapper")
+    it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_author_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_id')
@@ -277,29 +262,29 @@ describe 'select input' do
 
     0.upto(1) do |i|
       it 'should have all option groups and the right values' do
-        output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
+        output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{@continent_names[i]}']", @authors[i].to_label)
       end
 
       it 'should have custom group labels' do
-        output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
+        output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{@continents[i].id}']", @authors[i].to_label)
       end
 
       it 'should have custom author labels' do
-        output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
+        output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{@continent_names[i]}']", @authors[i].login)
       end
 
       it 'should have custom author and group labels' do
-        output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
+        output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{@continents[i].id}']", @authors[i].login)
       end
     end
 
     it 'should have no duplicate groups' do
-      output_buffer.should have_tag('form div.control-group div.controls select optgroup', :count => 8)
+      output_buffer.should have_tag('form div.clearfix div.input select optgroup', :count => 8)
     end
 
     it 'should sort the groups on the label method' do
-      output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='Africa']")
-      output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='99']")
+      output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='Africa']")
+      output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='99']")
     end
 
     it 'should call find with :include for more optimized queries' do
@@ -318,7 +303,7 @@ describe 'select input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("select-wrapper")
+    it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("author_posts_input")
     it_should_have_label_with_text(/Post/)
     it_should_have_label_for('author_post_ids')
@@ -327,31 +312,27 @@ describe 'select input' do
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.should have_tag('form div.control-group div.controls select')
-      output_buffer.should have_tag('form div.control-group div.controls select#author_post_ids')
+      output_buffer.should have_tag('form div.clearfix div.input select')
+      output_buffer.should have_tag('form div.clearfix div.input select#author_post_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.should have_tag('form div.control-group div.controls select[@multiple="multiple"]')
+      output_buffer.should have_tag('form div.clearfix div.input select[@multiple="multiple"]')
     end
 
     it 'should append [] to the name attribute for multiple select' do
-      output_buffer.should have_tag('form div.control-group div.controls select[@multiple="multiple"][@name="author[post_ids][]"]')
-    end
-
-    it 'should have a hidden field' do
-      output_buffer.should have_tag('form div.control-group div.controls input[@type="hidden"][@name="author[post_ids][]"]')
+      output_buffer.should have_tag('form div.clearfix div.input select[@multiple="multiple"][@name="author[post_ids][]"]')
     end
 
     it 'should have a select option for each Post' do
-      output_buffer.should have_tag('form div.control-group div.controls select option', :count => ::Post.all.size)
+      output_buffer.should have_tag('form div.clearfix div.input select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{post.id}']", /#{post.to_label}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{post.id}']", /#{post.to_label}/)
       end
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.should_not have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should_not have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
@@ -359,7 +340,7 @@ describe 'select input' do
         concat(builder.input(:posts, :as => :select, :multiple => false, :include_blank => true))
       end)
 
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
@@ -367,11 +348,11 @@ describe 'select input' do
         concat(builder.input(:posts, :as => :select, :multiple => true, :include_blank => true))
       end)
 
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.should have_tag('form div.control-group div.controls select option[@selected]', :count => 1)
+      output_buffer.should have_tag('form div.clearfix div.input select option[@selected]', :count => 1)
     end
   end
 
@@ -382,7 +363,7 @@ describe 'select input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("select-wrapper")
+    it_should_have_input_wrapper_with_class("select")
     it_should_have_input_wrapper_with_id("post_authors_input")
     it_should_have_label_with_text(/Author/)
     it_should_have_label_for('post_author_ids')
@@ -391,23 +372,23 @@ describe 'select input' do
     it_should_use_the_collection_when_provided(:select, 'option')
 
     it 'should have a select inside the wrapper' do
-      output_buffer.should have_tag('form div.control-group div.controls select')
-      output_buffer.should have_tag('form div.control-group div.controls select#post_author_ids')
+      output_buffer.should have_tag('form div.clearfix div.input select')
+      output_buffer.should have_tag('form div.clearfix div.input select#post_author_ids')
     end
 
     it 'should have a multi-select select' do
-      output_buffer.should have_tag('form div.control-group div.controls select[@multiple="multiple"]')
+      output_buffer.should have_tag('form div.clearfix div.input select[@multiple="multiple"]')
     end
 
     it 'should have a select option for each Author' do
-      output_buffer.should have_tag('form div.control-group div.controls select option', :count => ::Author.all.size)
+      output_buffer.should have_tag('form div.clearfix div.input select option', :count => ::Author.all.size)
       ::Author.all.each do |author|
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{author.id}']", /#{author.to_label}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
 
     it 'should not have a blank option by default' do
-      output_buffer.should_not have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should_not have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should respect the :include_blank option for single selects' do
@@ -415,7 +396,7 @@ describe 'select input' do
         concat(builder.input(:authors, :as => :select, :multiple => false, :include_blank => true))
       end)
 
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should respect the :include_blank option for multiple selects' do
@@ -423,11 +404,11 @@ describe 'select input' do
         concat(builder.input(:authors, :as => :select, :multiple => true, :include_blank => true))
       end)
 
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']")
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']")
     end
 
     it 'should have one option with a "selected" attribute' do
-      output_buffer.should have_tag('form div.control-group div.controls select option[@selected]', :count => 1)
+      output_buffer.should have_tag('form div.clearfix div.input select option[@selected]', :count => 1)
     end
   end
 
@@ -440,11 +421,11 @@ describe 'select input' do
     end
 
     it 'should have a select with prompt' do
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']", /choose author/, :count => 1)
+      output_buffer.should have_tag("form div.clearfix div.input select option[@value='']", /choose author/, :count => 1)
     end
 
-    it 'should not have a second blank select option' do
-      output_buffer.should have_tag("form div.control-group div.controls select option[@value='']", :count => 1)
+    it 'should not have a blank select option' do
+      output_buffer.should_not have_tag("form div.clearfix div.input select option[@value='']", "")
     end
   end
 
@@ -456,18 +437,18 @@ describe 'select input' do
     end
 
     it 'should generate label' do
-      output_buffer.should have_tag('form div.control-group label.control-label', /Author/)
-      output_buffer.should have_tag("form div.control-group label.control-label[@for='project_author']")
+      output_buffer.should have_tag('form div.clearfix label', /Author/)
+      output_buffer.should have_tag("form div.clearfix label[@for='project_author']")
     end
 
     it 'should generate select inputs' do
-      output_buffer.should have_tag('form div.control-group div.controls select#project_author')
-      output_buffer.should have_tag('form div.control-group div.controls select option', :count => ::Author.all.size + 1)
+      output_buffer.should have_tag('form div.clearfix div.input select#project_author')
+      output_buffer.should have_tag('form div.clearfix div.input select option', :count => ::Author.all.size + 1)
     end
 
     it 'should generate an option to each item' do
       ::Author.all.each do |author|
-        output_buffer.should have_tag("form div.control-group div.controls select option[@value='#{author.id}']", /#{author.to_label}/)
+        output_buffer.should have_tag("form div.clearfix div.input select option[@value='#{author.id}']", /#{author.to_label}/)
       end
     end
   end
@@ -478,27 +459,27 @@ describe 'select input' do
       concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
         concat(builder.input(:author_name, :as => :select, :collection => ::Author.all))
       end)
-      output_buffer.should have_tag("form div.control-group div.controls select[@name='project[author_name]']")
+      output_buffer.should have_tag("form div.clearfix div.input select[@name='project[author_name]']")
     end
-
+    
     describe 'and :multiple is set to true through :input_html' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_name, :as => :select, :input_html => {:multiple => true} ))
         end)
-        output_buffer.should have_tag("form div.control-group div.controls select[@multiple]")
+        output_buffer.should have_tag("form div.clearfix div.input select[@multiple]")
       end
     end
-
+    
     describe 'and :multiple is set to true' do
       it "should make the select a multi-select" do
         concat(semantic_form_for(:project, :url => 'http://test.host') do |builder|
           concat(builder.input(:author_name, :as => :select, :multiple => true, :collection => ["Fred", "Bob"]))
         end)
-        output_buffer.should have_tag("form div.control-group div.controls select[@multiple]")
+        output_buffer.should have_tag("form div.clearfix div.input select[@multiple]")
       end
     end
-
+    
   end
 
   describe 'when a grouped collection collection is given' do
@@ -513,12 +494,12 @@ describe 'select input' do
 
     it 'should generate an option to each item' do
       @grouped_opts.each do |opt_pair|
-        output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{opt_pair[0]}']")
+        output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{opt_pair[0]}']")
         opt_pair[1].each do |v|
-          output_buffer.should have_tag("form div.control-group div.controls select optgroup[@label='#{opt_pair[0]}'] option[@value='#{v}']")
+          output_buffer.should have_tag("form div.clearfix div.input select optgroup[@label='#{opt_pair[0]}'] option[@value='#{v}']")
         end
       end
-      output_buffer.should have_tag("form div.control-group div.controls select optgroup option[@selected]","hands")
+      output_buffer.should have_tag("form div.clearfix div.input select optgroup option[@selected]","hands")
     end
   end
 
@@ -540,7 +521,7 @@ describe 'select input' do
       end
 
       it "should render a select field" do
-        output_buffer.should have_tag("form div.control-group div.controls select", :count => 2)
+        output_buffer.should have_tag("form div.clearfix div.input select", :count => 2)
       end
     end
 
@@ -556,7 +537,7 @@ describe 'select input' do
       end
 
       it "should render a text field" do
-        output_buffer.should have_tag("form div.control-group div.controls input[@type='text']", :count => 2)
+        output_buffer.should have_tag("form div.clearfix div.input input[@type='text']", :count => 2)
       end
     end
   end
@@ -572,33 +553,6 @@ describe 'select input' do
     it_should_have_label_for("context2_post_author_ids")
   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 => :select))
-        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 select tag' do
-      output_buffer.should have_tag("select#post_author_attributes_3_name")
-    end
-
-    it 'should index the name of the select' do
-      output_buffer.should have_tag("select[@name='post[author_attributes][3][name]']")
-    end
-
-  end
-
   context "when required" do
     it "should add the required attribute to the select's html options" do
       with_config :use_required_attribute, true do