speedo-formstrap 1.2.0 → 1.2.1

data/spec/inputs/date_input_spec.rb

@@ -8,7 +8,7 @@ describe 'date input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe "general" do
@@ -20,8 +20,8 @@ describe 'date input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("date-wrapper")
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class("date")
+    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_publish_at_input")
@@ -31,7 +31,7 @@ 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.should have_tag('form div.control-group.date-wrapper label.control-label', /Publish at/)
+      output_buffer.should have_tag('form div.clearfix.date label', /Publish at/)
     end
 
     # it 'should associate the legend label with the first select' do
@@ -42,8 +42,8 @@ describe 'date input' do
     # end
 
     it 'should (sort of) associate the label with the input' do
-      output_buffer.should have_tag('form div.control-group.date-wrapper label.control-label[@for="post_publish_at"]')
-      output_buffer.should have_tag('form div.control-group.date-wrapper div.controls input[@id="post_publish_at[date]"]')
+      output_buffer.should have_tag('form div.clearfix.date label[@for="post_publish_at"]')
+      output_buffer.should have_tag('form div.clearfix.date div.input input[@id="post_publish_at[date]"]')
     end
 
     # it 'should have an ordered list of three items inside the fieldset' do
@@ -58,7 +58,7 @@ describe 'date input' do
     #   output_buffer.should have_tag('form li.date fieldset ol li label', /day/i)
     # end
     it 'should have an text input inside the div' do
-      output_buffer.should have_tag('form div.control-group.date-wrapper div.controls input[@type="text"]')
+      output_buffer.should have_tag('form div.clearfix.date div.input input[@type="text"]')
     end
 
     # it 'should have three selects for year, month and day' do
@@ -97,7 +97,7 @@ describe 'date input' do
   #         output_buffer.should have_tag('form li.date fieldset ol li label', f == field ? /another #{f} label/i : /#{f}/i)
   #       end
   #     end
-  #
+  # 
   #     it "should not display the label for the #{field} field when :labels[:#{field}] is blank" do
   #       output_buffer.replace ''
   #       concat(semantic_form_for(@new_post) do |builder|
@@ -108,7 +108,7 @@ describe 'date input' do
   #         output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
   #       end
   #     end
-  #
+  #     
   #     it "should not display the label for the #{field} field when :labels[:#{field}] is false" do
   #       output_buffer.replace ''
   #       concat(semantic_form_for(@new_post) do |builder|
@@ -119,21 +119,21 @@ describe 'date input' do
   #         output_buffer.should have_tag('form li.date fieldset ol li label', /#{f}/i) unless field == f
   #       end
   #     end
-  #
-  #     it "should not render unsafe HTML when :labels[:#{field}] is false" do
+  #     
+  #     it "should not render unsafe HTML when :labels[:#{field}] is false" do 
   #       output_buffer.replace ''
   #       concat(semantic_form_for(@new_post) do |builder|
   #         concat(builder.input(:created_at, :as => :time, :include_seconds => true, :labels => { field => false }))
   #       end)
   #       output_buffer.should_not include(">")
   #     end
-  #
+  #     
   #   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 => :date, :required => true))
         end)
@@ -143,71 +143,5 @@ describe 'date input' do
       end
     end
   end
-
-  # We use text field for dates
-
-  # describe "when order does not include day" do
-  #   before do
-  #     output_buffer.replace ''
-  #     concat(semantic_form_for(@new_post) do |builder|
-  #       concat(builder.input(:publish_at, :as => :date, :order => [:year, :month]))
-  #     end)
-  #   end
-  #
-  #   it "should include a hidden input for day" do
-  #     output_buffer.should have_tag('input[@type="hidden"][@name="post[publish_at(3i)]"][@value="1"]')
-  #   end
-  #
-  #   it "should not include a select for day" do
-  #     output_buffer.should_not have_tag('select[@name="post[publish_at(3i)]"]')
-  #   end
-  # end
-  #
-  # describe "when order does not include month" do
-  #   before do
-  #     output_buffer.replace ''
-  #     concat(semantic_form_for(@new_post) do |builder|
-  #       concat(builder.input(:publish_at, :as => :date, :order => [:year, :day]))
-  #     end)
-  #   end
-  #
-  #   it "should include a hidden input for month" do
-  #     output_buffer.should have_tag('input[@type="hidden"][@name="post[publish_at(2i)]"][@value="1"]')
-  #   end
-  #
-  #   it "should not include a select for month" do
-  #     output_buffer.should_not have_tag('select[@name="post[publish_at(2i)]"]')
-  #   end
-  # end
-  #
-  # describe "when order does not include year" do
-  #   before do
-  #     output_buffer.replace ''
-  #     concat(semantic_form_for(@new_post) do |builder|
-  #       concat(builder.input(:publish_at, :as => :date, :order => [:month, :day]))
-  #     end)
-  #   end
-  #
-  #   it "should include a hidden input for month" do
-  #     output_buffer.should have_tag("input[@type=\"hidden\"][@name=\"post[publish_at(1i)]\"][@value=\"#{Time.now.year}\"]")
-  #   end
-  #
-  #   it "should not include a select for month" do
-  #     output_buffer.should_not have_tag('select[@name="post[publish_at(1i)]"]')
-  #   end
-  # end
-  #
-  # describe "when order does not have year first" do
-  #   before do
-  #     output_buffer.replace ''
-  #     concat(semantic_form_for(@new_post) do |builder|
-  #       concat(builder.input(:publish_at, :as => :date, :order => [:day, :month, :year]))
-  #     end)
-  #   end
-  #
-  #   it 'should associate the legend label with the new first select' do
-  #     output_buffer.should have_tag('form li.date fieldset legend.label label[@for="post_publish_at_3i"]')
-  #   end
-  # end
-
+  
 end

data/spec/inputs/datetime_input_spec.rb

@@ -8,7 +8,7 @@ describe 'datetime input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe "general" do
@@ -21,8 +21,8 @@ describe 'datetime input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class("datetime-wrapper")
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class("datetime")
+    it_should_have_input_wrapper_with_class(:clearfix)
     it_should_have_input_wrapper_with_class(:stringish) # Decide about this.
     it_should_have_input_class_in_the_right_place
     it_should_have_input_wrapper_with_id("post_publish_at_input")
@@ -30,9 +30,9 @@ describe 'datetime input' do
     # it_should_have_a_nested_fieldset_with_class('fragments')
     # it_should_have_a_nested_ordered_list_with_class('fragments-group')
     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.should have_tag('form div.control-group.datetime-wrapper label.control-label', /Publish at/)
+      output_buffer.should have_tag('form div.clearfix.datetime label', /Publish at/)
     end
 
     # it 'should associate the legend label with the first select' do
@@ -41,7 +41,7 @@ describe 'datetime input' do
     #   output_buffer.should have_tag('form li.datetime fieldset legend.label label[@for]')
     #   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.should have_tag('form li.datetime fieldset ol.fragments-group')
     #   output_buffer.should have_tag('form li.datetime fieldset ol li.fragment', :count => 5)
@@ -55,26 +55,26 @@ describe 'datetime input' do
     #   output_buffer.should have_tag('form li.datetime fieldset ol li label', /hour/i)
     #   output_buffer.should have_tag('form li.datetime fieldset ol li label', /min/i)
     # end
-
+    
     # it 'should have five selects' do
     #   output_buffer.should have_tag('form li.datetime fieldset ol li select', :count => 5)
     # end
 
     it 'should have two inputs' do
-      output_buffer.should have_tag('form div.control-group.datetime-wrapper div.controls input', :count => 2)
+      output_buffer.should have_tag('form div.clearfix.datetime div.input input', :count => 2)
     end
 
   end
 
   describe "when namespace is provided" do
-
+  
     before do
       output_buffer.replace ''
       concat(semantic_form_for(@new_post, :namespace => "context2") do |builder|
         concat(builder.input(:publish_at, :as => :datetime))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_id("context2_post_publish_at_input")
     it_should_have_input_with_id("context2_post_publish_at[date]")
     it_should_have_input_with_id("context2_post_publish_at[time]")
@@ -83,12 +83,12 @@ describe 'datetime input' do
     # it_should_have_select_with_id("context2_post_publish_at_3i")
     # it_should_have_select_with_id("context2_post_publish_at_4i")
     # it_should_have_select_with_id("context2_post_publish_at_5i")
-
+  
   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 => :datetime, :required => true))
         end)
@@ -97,5 +97,5 @@ describe 'datetime input' do
       end
     end
   end
-
+  
 end

data/spec/inputs/email_input_spec.rb

@@ -8,7 +8,7 @@ describe 'email 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 'email input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class('email-wrapper')
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class(:email)
+    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_email_input")
@@ -43,38 +43,10 @@ describe 'email input' do
     it_should_have_label_and_input_with_id("context2_post_email")
 
   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 => :email))
-        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 => :email, :required => true))
         end)
@@ -82,6 +54,6 @@ describe 'email input' do
       end
     end
   end
-
+  
 end
 

data/spec/inputs/file_input_spec.rb

@@ -8,15 +8,15 @@ describe 'file input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:body, :as => :file))
     end)
   end
 
-  it_should_have_input_wrapper_with_class("file-wrapper")
-  it_should_have_input_wrapper_with_class("control-group")
+  it_should_have_input_wrapper_with_class("file")
+  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_body_input")
   it_should_have_label_with_text(/Body/)
@@ -29,7 +29,7 @@ describe 'file input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :file, :input_html => { :class => 'myclass' }))
     end)
-    output_buffer.should have_tag("form div.control-group div.controls input.myclass")
+    output_buffer.should have_tag("form div.clearfix div.input input.myclass")
   end
 
   describe "when namespace is provided" do
@@ -47,35 +47,7 @@ describe 'file input' do
     it_should_have_label_and_input_with_id("context2_post_body")
 
   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 => :file))
-        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
-
-
+  
   context "when required" do
     it "should add the required attribute to the input's html options" do
       with_config :use_required_attribute, true do
@@ -86,6 +58,6 @@ describe 'file input' do
       end
     end
   end
-
+  
 end
 

data/spec/inputs/hidden_input_spec.rb

@@ -8,7 +8,7 @@ describe 'hidden input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
 
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:secret, :as => :hidden))
@@ -19,37 +19,37 @@ describe 'hidden input' do
     end)
   end
 
-  it_should_have_input_wrapper_with_class("hidden-wrapper")
-  it_should_have_input_wrapper_with_class("control-group")
+  it_should_have_input_wrapper_with_class("hidden")
+  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_secret_input")
   it_should_not_have_a_label
 
   it "should generate a input field" do
-    output_buffer.should have_tag("form div.control-group div.controls input#post_secret")
-    output_buffer.should have_tag("form div.control-group div.controls input#post_secret[@type=\"hidden\"]")
-    output_buffer.should have_tag("form div.control-group div.controls input#post_secret[@name=\"post[secret]\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_secret")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_secret[@type=\"hidden\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_secret[@name=\"post[secret]\"]")
   end
 
   it "should get value from the object" do
-    output_buffer.should have_tag("form div.control-group div.controls input#post_secret[@type=\"hidden\"][@value=\"1\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_secret[@type=\"hidden\"][@value=\"1\"]")
   end
-
+  
   it "should pass any explicitly specified value - using :value" do
-    output_buffer.should have_tag("form div.control-group div.controls input#post_author_id[@type=\"hidden\"][@value=\"99\"]")
+    output_buffer.should have_tag("form div.clearfix div.input 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.should have_tag("form div.control-group div.controls input#post_published[@type=\"hidden\"][@value=\"true\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_published[@type=\"hidden\"][@value=\"true\"]")
   end
 
   it "should pass any option specified using :input_html" do
-    output_buffer.should have_tag("form div.control-group div.controls input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#new_post_reviewer[@type=\"hidden\"][@class=\"new_post_reviewer\"]")
   end
 
   it "should prefer :input_html over directly supplied options" do
-    output_buffer.should have_tag("form div.control-group div.controls input#post_author_id[@type=\"hidden\"][@value=\"formtastic_value\"]")
+    output_buffer.should have_tag("form div.clearfix div.input input#post_author_id[@type=\"hidden\"][@value=\"formtastic_value\"]")
   end
 
   it "should not render inline errors" do
@@ -99,35 +99,7 @@ describe 'hidden input' do
     end
 
   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 => :hidden))
-        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
-
-
+  
   context "when required" do
     it "should not add the required attribute to the input's html options" do
       concat(semantic_form_for(@new_post) do |builder|