formtastic 2.0.2 → 2.1.0.beta1

data/spec/inputs/number_input_spec.rb

@@ -26,6 +26,7 @@ describe 'number input' do
 
     it_should_have_input_wrapper_with_class(:number)
     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("post_title_input")
     it_should_have_label_with_text(/Title/)
@@ -33,10 +34,11 @@ describe 'number input' do
     it_should_have_input_with_id("post_title")
     it_should_have_input_with_type(:number)
     it_should_have_input_with_name("post[title]")
-    it_should_use_default_text_field_size_when_not_nil(:string)
-    it_should_not_use_default_text_field_size_when_nil(:string)
-    it_should_apply_custom_input_attributes_when_input_html_provided(:string)
-    it_should_apply_custom_for_to_label_when_input_html_id_provided(:string)
+    # @todo this is not testing what it should be testing!
+    # it_should_use_default_text_field_size_when_not_nil(:string)
+    # it_should_not_use_default_text_field_size_when_nil(:string)
+    # 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(:number)
     
   end
@@ -66,6 +68,34 @@ describe 'number input' do
     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 => :number))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#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/inputs/password_input_spec.rb

@@ -57,6 +57,34 @@ describe 'password 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 => :password))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#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/inputs/phone_input_spec.rb

@@ -42,6 +42,34 @@ describe 'phone 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 => :phone))
+        end)
+      end)
+    end
+    
+    it 'should index the id of the wrapper' do
+      output_buffer.should have_tag("li#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/inputs/placeholder_spec.rb

@@ -16,18 +16,18 @@ describe 'string input' do
   
   describe "placeholder text" do
     
-    [:email, :number, :password, :phone, :search, :string, :url].each do |type|
+    [:email, :number, :password, :phone, :search, :string, :url, :text].each do |type|
       
       describe "for #{type} inputs" do
-    
+        
         describe "when found in i18n" do
           it "should have a placeholder containing i18n text" do
             with_config :i18n_lookups_by_default, true do
               ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title))
+                concat(builder.input(:title, :as => type))
               end)
-              output_buffer.should have_tag('input[@placeholder="War and Peace"]')
+              output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="War and Peace"]')
             end
           end
         end
@@ -35,9 +35,9 @@ describe 'string input' do
         describe "when not found in i18n" do
           it "should not have placeholder" do
             concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title))
+              concat(builder.input(:title, :as => type))
             end)
-            output_buffer.should_not have_tag('input[@placeholder]')
+            output_buffer.should_not have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder]')
           end
         end
         
@@ -46,9 +46,9 @@ describe 'string input' do
             with_config :i18n_lookups_by_default, true do
               ::I18n.backend.store_translations :en, :formtastic => { :placeholders => { :title => 'War and Peace' }}
               concat(semantic_form_for(@new_post) do |builder|
-                concat(builder.input(:title, :input_html => { :placeholder => "Foo" }))
+                concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Foo" }))
               end)
-              output_buffer.should have_tag('input[@placeholder="Foo"]')
+              output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="Foo"]')
             end
           end
         end
@@ -56,9 +56,9 @@ describe 'string input' do
         describe "when found in :input_html" do
           it "should use the :input_html placeholder" do
             concat(semantic_form_for(@new_post) do |builder|
-              concat(builder.input(:title, :input_html => { :placeholder => "Untitled" }))
+              concat(builder.input(:title, :as => type, :input_html => { :placeholder => "Untitled" }))
             end)
-            output_buffer.should have_tag('input[@placeholder="Untitled"]')
+            output_buffer.should have_tag((type == :text ? 'textarea' : 'input') + '[@placeholder="Untitled"]')
           end
         end
         

data/spec/inputs/radio_input_spec.rb

@@ -45,16 +45,16 @@ describe 'radio input' do
     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')
       end
-      
+
       it 'should not add the required attribute to each input' do
         output_buffer.should_not have_tag('li.choice 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 li fieldset ol li label', /#{author.to_label}/)
@@ -67,7 +67,7 @@ describe 'radio input' do
           output_buffer.should have_tag("form li fieldset ol li.author_#{author.id} label")
         end
       end
-      
+
       it "should have a radio input" do
         ::Author.all.each do |author|
           output_buffer.should have_tag("form li fieldset ol li label input#post_author_id_#{author.id}")
@@ -201,7 +201,7 @@ describe 'radio input' do
       output_buffer.should_not have_tag("legend.label")
       output_buffer.should_not include(">")
     end
-    
+
     it "should not cause escaped HTML" do
       output_buffer.should_not include(">")
     end
@@ -234,4 +234,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 wrapper' do
+      output_buffer.should have_tag("li#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("li.choice label", /1/)
+      output_buffer.should have_tag("li.choice label", /2/)
+      output_buffer.should have_tag("li.choice 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
 
@@ -20,7 +19,8 @@ describe 'range input' do
 
     it_should_have_input_wrapper_with_class(:range)
     it_should_have_input_wrapper_with_class(:input)
-    it_should_have_input_wrapper_with_class(:stringish) # might be removed
+    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")
@@ -42,6 +42,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 wrapper' do
+      output_buffer.should have_tag("li#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

@@ -42,6 +42,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 wrapper' do
+      output_buffer.should have_tag("li#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/inputs/select_input_spec.rb

@@ -75,6 +75,16 @@ describe 'select input' do
         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
@@ -90,6 +100,7 @@ describe 'select input' do
       end
 
       after do
+        ::I18n.load_path = []
         ::I18n.backend.store_translations :en, {}
       end
 
@@ -152,6 +163,10 @@ describe 'select input' do
     it 'should not create a multi-select' do
       output_buffer.should_not have_tag('form li select[@multiple]')
     end
+    
+    it 'should not add a hidden input' do
+      output_buffer.should_not have_tag('form li input[@type="hidden"]')
+    end
 
     it 'should create a select without size' do
       output_buffer.should_not have_tag('form li select[@size]')
@@ -317,11 +332,15 @@ describe 'select input' do
     it 'should have a multi-select select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"]')
     end
-
+    
     it 'should append [] to the name attribute for multiple select' do
       output_buffer.should have_tag('form li select[@multiple="multiple"][@name="author[post_ids][]"]')
     end
 
+    it 'should have a hidden field' do
+      output_buffer.should have_tag('form li input[@type="hidden"][@name="author[post_ids][]"]')
+    end
+
     it 'should have a select option for each Post' do
       output_buffer.should have_tag('form li select option', :count => ::Post.all.size)
       ::Post.all.each do |post|
@@ -422,8 +441,8 @@ describe 'select input' do
       output_buffer.should have_tag("form li select option[@value='']", /choose author/, :count => 1)
     end
 
-    it 'should not have a blank select option' do
-      output_buffer.should_not have_tag("form li select option[@value='']", "")
+    it 'should not have a second blank select option' do
+      output_buffer.should have_tag("form li select option[@value='']", :count => 1)
     end
   end
 
@@ -459,7 +478,7 @@ describe 'select input' do
       end)
       output_buffer.should have_tag("form li 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|
@@ -468,7 +487,7 @@ describe 'select input' do
         output_buffer.should have_tag("form li 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|
@@ -477,7 +496,7 @@ describe 'select input' do
         output_buffer.should have_tag("form li select[@multiple]")
       end
     end
-    
+
   end
 
   describe 'when a grouped collection collection is given' do
@@ -550,6 +569,33 @@ describe 'select input' do
     it_should_have_select_with_id("context2_post_author_ids")
     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("li#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