formtastic-bootstrap 1.2.0 → 2.0.0

data/spec/inputs/text_input_spec.rb

@@ -8,29 +8,28 @@ describe 'text 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(:body, :as => :text))
     end)
   end
 
+  it_should_have_bootstrap_horizontal_wrapping
   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_class(:input)
   it_should_have_input_wrapper_with_id("post_body_input")
   it_should_have_label_with_text(/Body/)
   it_should_have_label_for("post_body")
   it_should_have_textarea_with_id("post_body")
   it_should_have_textarea_with_name("post[body]")
-  it_should_apply_error_logic_for_input_type(:text)
+  it_should_apply_error_logic_for_input_type(:number)
 
   it 'should use input_html to style inputs' do
     output_buffer.replace ''
     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.clearfix div.input textarea.myclass")
+    output_buffer.should have_tag("form div.control-group div.controls textarea.myclass")
   end
 
   it "should have a cols attribute when :cols is a number in :input_html" do
@@ -38,7 +37,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.clearfix div.input textarea[@cols='42']")
+    output_buffer.should have_tag("form div.control-group div.controls textarea[@cols='42']")
   end
 
   it "should not have a cols attribute when :cols is nil in :input_html" do
@@ -46,7 +45,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.clearfix div.input textarea[@cols]")
+    output_buffer.should_not have_tag("form div.control-group div.controls textarea[@cols]")
   end
 
   it "should have a rows attribute when :rows is a number in :input_html" do
@@ -54,7 +53,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.clearfix div.input textarea[@rows='42']")
+    output_buffer.should have_tag("form div.control-group div.controls textarea[@rows='42']")
 
   end
 
@@ -63,7 +62,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.clearfix div.input textarea[@rows]")
+    output_buffer.should_not have_tag("form div.control-group div.controls textarea[@rows]")
   end
 
   describe "when namespace is provided" do
@@ -71,7 +70,6 @@ describe 'text input' 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(:body, :as => :text))
@@ -84,6 +82,33 @@ describe 'text 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 => :text))
+        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("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 
@@ -119,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.clearfix div.input textarea[@rows='12']")
+        output_buffer.should have_tag("form div.control-group div.controls textarea[@rows='12']")
       end
     end
 
@@ -128,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.clearfix div.input textarea[@rows]")
+        output_buffer.should_not have_tag("form div.control-group div.controls textarea[@rows]")
       end
 
     end
@@ -144,7 +169,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.clearfix div.input textarea[@cols='10']")
+        output_buffer.should have_tag("form div.control-group div.controls textarea[@cols='10']")
       end
     end
 
@@ -153,7 +178,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.clearfix div.input textarea[@cols]")
+        output_buffer.should_not have_tag("form div.control-group div.controls textarea[@cols]")
       end
 
     end

data/spec/inputs/time_select_input_spec.rb

@@ -0,0 +1,191 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'time select input' do
+
+  include FormtasticSpecHelper
+
+  before do
+    @output_buffer = ''
+    mock_everything
+  end
+
+  describe "general" do
+    before do
+      ::I18n.backend.reload!
+      output_buffer.replace ''
+    end
+
+    describe "with :ignore_date => true" do
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time_select, :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'))
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time_select, :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')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+        output_buffer.should have_tag('input#post_publish_at_1i[@value="2010"]')
+        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 "with :ignore_date => false and no initial Time" do
+      before do
+        @new_post.stub(:publish_at)
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time_select, :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')
+        output_buffer.should have_tag('input#post_publish_at_3i')
+      end
+
+      it 'should not have values in hidden inputs for day, month and year' do
+        output_buffer.should have_tag('input#post_publish_at_1i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_2i[@value=""]')
+        output_buffer.should have_tag('input#post_publish_at_3i[@value=""]')
+      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
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time_select))
+        end)
+      end
+
+      it_should_have_bootstrap_horizontal_wrapping
+      it_should_have_input_wrapper_with_class("time_select")
+      it_should_have_input_wrapper_with_class(:input)
+      it_should_have_input_wrapper_with_id("post_publish_at_input")
+      it_should_apply_error_logic_for_input_type(:time_select)
+
+      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_select label.control-label', /Publish at/)
+      end
+
+      it 'should have two selects for hour and minute' do
+        output_buffer.should have_tag('form div.control-group.time_select div.controls select', :count => 2)
+      end
+    end
+
+    describe "with seconds" do
+      before do
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:publish_at, :as => :time_select, :include_seconds => true))
+        end)
+      end
+
+      it 'should have three selects for hour, minute and seconds' do
+        output_buffer.should have_tag('form div.control-group.time_select div.controls select', :count => 3)
+      end
+    end
+  end
+
+  describe ':labels option' do
+    it "should provide a message that :labels is not supported" do
+      pending ':labels is not supported'
+    end
+  end
+
+  describe ':namespace option' do
+    before do
+      concat(semantic_form_for(@new_post, :namespace => 'form2') do |builder|
+        concat(builder.input(:publish_at, :as => :time_select))
+      end)
+    end
+
+    it 'should have a tag matching the namespace' do
+      output_buffer.should have_tag('#form2_post_publish_at_input')
+      output_buffer.should have_tag('#form2_post_publish_at_4i')
+      output_buffer.should have_tag('#form2_post_publish_at_5i')
+    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 
+        concat(semantic_form_for(@new_post) do |builder|
+          concat(builder.input(:title, :as => :time_select, :required => true))
+        end)
+        output_buffer.should have_tag("select[@required]", :count => 2)
+      end
+    end
+  end
+  
+  describe "when index is provided" do
+
+    before do
+      concat(semantic_form_for(@new_post) do |builder|
+        concat(builder.fields_for(:author, :index => 3) do |author|
+          concat(author.input(:created_at, :as => :time_select))
+        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_created_at_input")
+    end
+
+    it 'should index the id of the select tag' do
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_1i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_2i")
+      output_buffer.should have_tag("input#post_author_attributes_3_created_at_3i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_4i")
+      output_buffer.should have_tag("select#post_author_attributes_3_created_at_5i")
+    end
+
+    it 'should index the name of the select tag' do
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(1i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(2i)]']")
+      output_buffer.should have_tag("input[@name='post[author_attributes][3][created_at(3i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(4i)]']")
+      output_buffer.should have_tag("select[@name='post[author_attributes][3][created_at(5i)]']")
+    end
+
+  end
+  
+end
+
+
+

data/spec/inputs/time_zone_input_spec.rb

@@ -8,35 +8,35 @@ describe 'time_zone 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(:time_zone))
     end)
   end
 
+  it_should_have_bootstrap_horizontal_wrapping
   it_should_have_input_wrapper_with_class("time_zone")
-  it_should_have_input_wrapper_with_class(:clearfix)
+  it_should_have_input_wrapper_with_class(:input)
   it_should_have_input_wrapper_with_id("post_time_zone_input")
   it_should_apply_error_logic_for_input_type(:time_zone)
 
   it 'should generate a label for the input' do
-    output_buffer.should have_tag('form div label')
-    output_buffer.should have_tag('form div label[@for="post_time_zone"]')
-    output_buffer.should have_tag('form div label', /Time zone/)
+    output_buffer.should have_tag('form div.control-group label.control-label')
+    output_buffer.should have_tag('form div.control-group label.control-label[@for="post_time_zone"]')
+    output_buffer.should have_tag('form div.control-group label.control-label', /Time zone/)
   end
 
   it "should generate a select" do
-    output_buffer.should have_tag("form div select")
-    output_buffer.should have_tag("form div select#post_time_zone")
-    output_buffer.should have_tag("form div select[@name=\"post[time_zone]\"]")
+    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_time_zone")
+    output_buffer.should have_tag("form div.control-group div.controls select[@name=\"post[time_zone]\"]")
   end
 
   it 'should use input_html to style inputs' do
     concat(semantic_form_for(@new_post) do |builder|
       concat(builder.input(:time_zone, :input_html => { :class => 'myclass' }))
     end)
-    output_buffer.should have_tag("form div select.myclass")
+    output_buffer.should have_tag("form div.control-group div.controls select.myclass")
   end
 
   describe "when namespace is provided" do
@@ -44,7 +44,6 @@ describe 'time_zone input' 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(:time_zone))
@@ -62,7 +61,6 @@ describe 'time_zone input' do
     before do
       @output_buffer = ''
       mock_everything
-      Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
 
       concat(semantic_form_for(@new_post) do |builder|
         concat(builder.fields_for(:author, :index => 3) do |author|
@@ -71,8 +69,8 @@ describe 'time_zone input' do
       end)
     end
     
-    it 'should index the id of the wrapper' do
-      output_buffer.should have_tag("div#post_author_attributes_3_name_input")
+    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
@@ -94,15 +92,15 @@ describe 'time_zone input' do
     end
 
     it 'should generate labels' do
-      output_buffer.should have_tag('form div label')
-      output_buffer.should have_tag('form div label[@for="project_time_zone"]')
-      output_buffer.should have_tag('form div label', /Time zone/)
+      output_buffer.should have_tag('form div.control-group label.control-label')
+      output_buffer.should have_tag('form div.control-group label.control-label[@for="project_time_zone"]')
+      output_buffer.should have_tag('form div.control-group label.control-label', /Time zone/)
     end
 
     it 'should generate select inputs' do
-      output_buffer.should have_tag("form div select")
-      output_buffer.should have_tag("form div select#project_time_zone")
-      output_buffer.should have_tag("form div select[@name=\"project[time_zone]\"]")
+      output_buffer.should have_tag("form div.control-group div.controls select")
+      output_buffer.should have_tag("form div.control-group div.controls select#project_time_zone")
+      output_buffer.should have_tag("form div.control-group div.controls select[@name=\"project[time_zone]\"]")
     end
   end
   

data/spec/inputs/url_input_spec.rb

@@ -8,7 +8,6 @@ describe 'url 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 'url input' do
       end)
     end
 
+    it_should_have_bootstrap_horizontal_wrapping
     it_should_have_input_wrapper_with_class(:url)
-    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_url_input")
     it_should_have_label_with_text(/Url/)
     it_should_have_label_for("post_url")
@@ -44,6 +43,34 @@ describe 'url 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 => :url))
+        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 

data/spec/spec_helper.rb

@@ -1,24 +1,30 @@
+require 'bundler/setup'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'rspec_tag_matchers'
-require 'rubygems'
-require 'bundler'
-Bundler.setup
 
-require 'active_support'
-require 'action_pack'
-require 'action_view'
-require 'action_controller'
-require 'action_dispatch'
+# require 'rspec'
+# require 'rspec_tag_matchers'
+# require 'rubygems'
+
+# Find Formtastic and grab its testing support first.
+formtastic_full_gem_path = Bundler.load.specs.find{|s| s.name == "formtastic" }.full_gem_path
+require File.join(formtastic_full_gem_path, 'spec', 'spec_helper.rb')
 
+# Now add in ours.
 require 'formtastic-bootstrap'
+require File.join(File.dirname(__FILE__), "support", "custom_macros.rb")
+require File.join(File.dirname(__FILE__), "support", "fb_custom_macros.rb")
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  config.include RspecTagMatchers  
-  config.include CustomMacros
+  config.before(:suite) do
+    Formtastic::Helpers::FormHelper.builder = FormtasticBootstrap::FormBuilder
+  end
+  config.include FbCustomMacros
 end
+
+# RSpec.configure do |config|
+#   config.include RspecTagMatchers  
+#   config.include CustomMacros
+# end