speedo-formstrap 1.2.0 → 1.2.1

data/spec/inputs/string_input_spec.rb

@@ -8,7 +8,7 @@ describe 'string 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 'string input' do
       end)
     end
 
-    it_should_have_input_wrapper_with_class('string-wrapper')
-    it_should_have_input_wrapper_with_class("control-group")
+    it_should_have_input_wrapper_with_class(:string)
+    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_title_input")
@@ -34,7 +34,7 @@ describe 'string input' do
     it_should_apply_custom_input_attributes_when_input_html_provided(:string)
     it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
     it_should_apply_error_logic_for_input_type(:string)
-
+    
     def input_field_for_method_should_have_maxlength(method, maxlength)
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.input(method))
@@ -63,30 +63,30 @@ describe 'string input' do
             concat(builder.input(:title))
           end)
 
-          output_buffer.should have_tag("form div.control-group div.controls input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
+          output_buffer.should have_tag("form div.clearfix div.input input##{@new_post.class.name.underscore}_title[@maxlength='#{maxlength}']")
         end
 
         it 'should have maxlength if the optional :if or :unless options are not supplied' do
           should_have_maxlength(42, :options => {:maximum => 42})
         end
-
+        
         it 'should have default maxlength if the optional :if condition is not satisifed' do
           should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => false})
         end
-
+        
         it 'should have default_maxlength if the optional :if proc evaluates to false' do
           should_have_maxlength(default_maxlength, :options => {:maximum => 42, :if => proc { |record| false }})
         end
-
+        
         it 'should have maxlength if the optional :if proc evaluates to true' do
           should_have_maxlength(42, :options => { :maximum => 42, :if => proc { |record| true } })
         end
-
+        
         it 'should have default maxlength if the optional :if with a method name evaluates to false' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :if => :specify_maxlength })
         end
-
+        
         it 'should have maxlength if the optional :if with a method name evaluates to true' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(42, :options => { :maximum => 42, :if => :specify_maxlength })
@@ -99,12 +99,12 @@ describe 'string input' do
         it 'should have maxlength if the optional :unless proc evaluates to false' do
           should_have_maxlength(42, :options => { :maximum => 42, :unless => proc { |record| false } })
         end
-
+        
         it 'should have default maxlength if the optional :unless with a method name evaluates to true' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(true)
           should_have_maxlength(default_maxlength, :options => { :maximum => 42, :unless => :specify_maxlength })
         end
-
+        
         it 'should have maxlength if the optional :unless with a method name evaluates to false' do
           @new_post.should_receive(:specify_maxlength).at_least(1).and_return(false)
           should_have_maxlength(42, :options => { :maximum => 42, :unless => :specify_maxlength })
@@ -114,74 +114,46 @@ describe 'string input' do
   end
 
   describe "when namespace is provided" do
-
+  
     before do
       concat(semantic_form_for(@new_post, :namespace => 'context2') do |builder|
         concat(builder.input(:title, :as => :string))
       end)
     end
-
+  
     it_should_have_input_wrapper_with_id("context2_post_title_input")
     it_should_have_label_and_input_with_id("context2_post_title")
-
-  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 => :string))
-        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 no object is provided" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string))
       end)
     end
-
+  
     it_should_have_label_with_text(/Title/)
     it_should_have_label_for("project_title")
     it_should_have_input_with_id("project_title")
     it_should_have_input_with_type(:text)
     it_should_have_input_with_name("project[title]")
   end
-
+  
   describe "when size is nil" do
     before do
       concat(semantic_form_for(:project, :url => 'http://test.host/') do |builder|
         concat(builder.input(:title, :as => :string, :input_html => {:size => nil}))
       end)
     end
-
+  
     it "should have no size attribute" do
       output_buffer.should_not have_tag("input[@size]")
     end
   end
-
+  
   describe "when required" do
-
+    
     context "and configured to use HTML5 attribute" do
       it "should add the required attribute to the input's html options" do
         with_config :use_required_attribute, true do
@@ -203,24 +175,7 @@ describe 'string input' do
         end
       end
     end
-
-  end
-
-  describe "with string prepended", :now => true do
-
-    before do
-      concat(semantic_form_for(:user) do |builder|
-        concat(builder.input(:handle, :as => :string, :prepend => '@'))
-      end)
-    end
-
-    it "should generate span with desired prepend string" do
-      output_buffer.should have_tag('form div.control-group div.controls div.input-prepend span.add-on', '@')
-    end
-
-    it "should wrap input in div.input-prepend" do
-      output_buffer.should have_tag('form div.control-group div.controls div.input-prepend input[name="user[handle]"]')
-    end
+    
   end
 
 end

data/spec/inputs/text_input_spec.rb

@@ -8,15 +8,15 @@ describe 'text 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 => :text))
     end)
   end
 
-  it_should_have_input_wrapper_with_class("text-wrapper")
-  it_should_have_input_wrapper_with_class("control-group")
+  it_should_have_input_wrapper_with_class("text")
+  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/)
@@ -30,7 +30,7 @@ describe 'text input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :class => 'myclass' }))
     end)
-    output_buffer.should have_tag("form div.control-group div.controls textarea.myclass")
+    output_buffer.should have_tag("form div.clearfix div.input textarea.myclass")
   end
 
   it "should have a cols attribute when :cols is a number in :input_html" do
@@ -38,7 +38,7 @@ describe 'text input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => 42 }))
     end)
-    output_buffer.should have_tag("form div.control-group div.controls textarea[@cols='42']")
+    output_buffer.should have_tag("form div.clearfix div.input textarea[@cols='42']")
   end
 
   it "should not have a cols attribute when :cols is nil in :input_html" do
@@ -46,7 +46,7 @@ describe 'text input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :cols => nil }))
     end)
-    output_buffer.should_not have_tag("form div.control-group div.controls textarea[@cols]")
+    output_buffer.should_not have_tag("form div.clearfix div.input textarea[@cols]")
   end
 
   it "should have a rows attribute when :rows is a number in :input_html" do
@@ -54,7 +54,7 @@ describe 'text input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => 42 }))
     end)
-    output_buffer.should have_tag("form div.control-group div.controls textarea[@rows='42']")
+    output_buffer.should have_tag("form div.clearfix div.input textarea[@rows='42']")
 
   end
 
@@ -63,7 +63,7 @@ describe 'text input' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:title, :as => :text, :input_html => { :rows => nil }))
     end)
-    output_buffer.should_not have_tag("form div.control-group div.controls textarea[@rows]")
+    output_buffer.should_not have_tag("form div.clearfix div.input textarea[@rows]")
   end
 
   describe "when namespace is provided" do
@@ -71,7 +71,7 @@ describe 'text 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, :namespace => 'context2') do |builder|
         concat(builder.input(:body, :as => :text))
@@ -83,37 +83,10 @@ describe 'text input' do
     it_should_have_label_for("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 => :text))
-        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("textarea#post_author_attributes_3_name")
-    end
-
-    it 'should index the name of the select tag' do
-      output_buffer.should have_tag("textarea[@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
+      with_config :use_required_attribute, true do 
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text, :required => true))
         end)
@@ -146,7 +119,7 @@ describe 'text input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end)
-        output_buffer.should have_tag("form div.control-group div.controls textarea[@rows='12']")
+        output_buffer.should have_tag("form div.clearfix div.input textarea[@rows='12']")
       end
     end
 
@@ -155,7 +128,7 @@ describe 'text input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end)
-        output_buffer.should_not have_tag("form div.control-group div.controls textarea[@rows]")
+        output_buffer.should_not have_tag("form div.clearfix div.input textarea[@rows]")
       end
 
     end
@@ -171,7 +144,7 @@ describe 'text input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end)
-        output_buffer.should have_tag("form div.control-group div.controls textarea[@cols='10']")
+        output_buffer.should have_tag("form div.clearfix div.input textarea[@cols='10']")
       end
     end
 
@@ -180,7 +153,7 @@ describe 'text input' do
         concat(semantic_form_for(@new_post) do |builder|
           concat(builder.input(:title, :as => :text))
         end)
-        output_buffer.should_not have_tag("form div.control-group div.controls textarea[@cols]")
+        output_buffer.should_not have_tag("form div.clearfix div.input textarea[@cols]")
       end
 
     end

data/spec/inputs/time_input_spec.rb

@@ -8,7 +8,7 @@ describe 'time input' do
   before do
     @output_buffer = ''
     mock_everything
-    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+    Formtastic::Helpers::FormHelper.builder = SpeedoFormstrap::FormBuilder
   end
 
   describe "general" do
@@ -23,20 +23,20 @@ describe 'time input' do
     #       concat(builder.input(:publish_at, :as => :time, :ignore_date => true))
     #     end)
     #   end
-    #
+    # 
     #   it 'should not have hidden inputs for day, month and year' do
     #     output_buffer.should_not have_tag('input#post_publish_at_1i')
     #     output_buffer.should_not have_tag('input#post_publish_at_2i')
     #     output_buffer.should_not have_tag('input#post_publish_at_3i')
     #   end
-    #
+    # 
     #   it 'should have an input for hour and minute' do
     #     output_buffer.should have_tag('select#post_publish_at_4i')
     #     output_buffer.should have_tag('select#post_publish_at_5i')
     #   end
-    #
+    # 
     # end
-    #
+    # 
     # describe "with :ignore_date => false" do
     #   before do
     #     @new_post.stub(:publish_at).and_return(Time.parse('2010-11-07'))
@@ -44,7 +44,7 @@ describe 'time input' do
     #       concat(builder.input(:publish_at, :as => :time, :ignore_date => false))
     #     end)
     #   end
-    #
+    # 
     #   it 'should have a hidden input for day, month and year' do
     #     output_buffer.should have_tag('input#post_publish_at_1i')
     #     output_buffer.should have_tag('input#post_publish_at_2i')
@@ -53,12 +53,12 @@ describe 'time input' do
     #     output_buffer.should have_tag('input#post_publish_at_2i[@value="11"]')
     #     output_buffer.should have_tag('input#post_publish_at_3i[@value="7"]')
     #   end
-    #
+    # 
     #   it 'should have an select for hour and minute' do
     #     output_buffer.should have_tag('select#post_publish_at_4i')
     #     output_buffer.should have_tag('select#post_publish_at_5i')
     #   end
-    #
+    # 
     # end
 
     describe "without seconds" do
@@ -68,8 +68,8 @@ describe 'time input' do
         end)
       end
 
-      it_should_have_input_wrapper_with_class("time-wrapper")
-      it_should_have_input_wrapper_with_class("control-group")
+      it_should_have_input_wrapper_with_class("time")
+      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")
@@ -77,17 +77,17 @@ describe 'time input' do
       it_should_apply_error_logic_for_input_type(:time)
 
       it 'should have a legend and label with the label text inside the fieldset' do
-        output_buffer.should have_tag('form div.control-group.time-wrapper label.control-label', /Publish at/)
+        output_buffer.should have_tag('form div.clearfix.time label', /Publish at/)
       end
 
       # TODO Is this right?
       it 'should (sort of) associate the label with the input' do
-        output_buffer.should have_tag('form div.control-group.time-wrapper label.control-label[@for="post_publish_at"]')
-        output_buffer.should have_tag('form div.control-group.time-wrapper div.controls input[@id="post_publish_at[time]"]')
+        output_buffer.should have_tag('form div.clearfix.time label[@for="post_publish_at"]')
+        output_buffer.should have_tag('form div.clearfix.time div.input input[@id="post_publish_at[time]"]')
       end
 
       it 'should have an text input inside the div' do
-        output_buffer.should have_tag('form div.control-group.time-wrapper div.controls input[@type="text"]')
+        output_buffer.should have_tag('form div.clearfix.time div.input input[@type="text"]')
       end
 
       # it 'should have five labels for hour and minute' do
@@ -95,7 +95,7 @@ describe 'time input' do
       #   output_buffer.should have_tag('form li.time fieldset ol li label', /hour/i)
       #   output_buffer.should have_tag('form li.time fieldset ol li label', /minute/i)
       # end
-      #
+      # 
       # it 'should have two selects for hour and minute' do
       #   output_buffer.should have_tag('form li.time fieldset ol li', :count => 2)
       # end
@@ -127,7 +127,7 @@ describe 'time input' do
       # end
     end
   end
-
+  
   # Ignore these since we only create the main label.
 
   # describe ':labels option' do
@@ -143,7 +143,7 @@ describe 'time input' do
   #         output_buffer.should have_tag('form li.time 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|
@@ -154,8 +154,8 @@ describe 'time input' do
   #         output_buffer.should have_tag('form li.time fieldset ol li label', /#{f}/i) unless field == f
   #       end
   #     end
-  #
-  #     it "should not render the label when :labels[:#{field}] is false" do
+  #     
+  #     it "should not render the label 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 }))
@@ -165,15 +165,15 @@ describe 'time input' do
   #         output_buffer.should have_tag('form li.time 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
 
@@ -192,7 +192,7 @@ describe 'time input' do
 
   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 => :time, :required => true))
         end)