simple_form 1.2.2 → 1.3.0

data/test/components/error_test.rb

@@ -3,14 +3,10 @@ require 'test_helper'
 class ErrorTest < ActionView::TestCase
 
   def with_error_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for(object) do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).error.to_s)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).error.to_s
+    end
   end
 
   test 'error should not generate content for attribute without errors' do
@@ -23,6 +19,12 @@ class ErrorTest < ActionView::TestCase
     assert_no_select 'span.error'
   end
 
+  test "error should not generate messages when object doesn't respond to errors method" do
+    @user.instance_eval { undef errors }
+    with_error_for @user, :name, :string
+    assert_no_select 'span.error'
+  end
+
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name, :string
     assert_select 'span.error', "can't be blank"

data/test/components/hint_test.rb

@@ -3,14 +3,10 @@ require 'test_helper'
 class HintTest < ActionView::TestCase
 
   def with_hint_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for(object) do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).hint.to_s)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).hint.to_s
+    end
   end
 
   test 'hint should not be generated by default' do

data/test/components/label_test.rb

@@ -2,20 +2,15 @@
 require 'test_helper'
 
 class LabelTest < ActionView::TestCase
-
   setup do
     SimpleForm::Inputs::Base.reset_i18n_cache :translate_required_html
   end
 
   def with_label_for(object, attribute_name, type, options={})
-    concat(simple_form_for(object) do |f|
-      f.attribute_name = attribute_name
-      f.reflection     = Association.new(Company, :company, {}) if options.delete(:setup_association)
-      f.input_type     = type
-      f.options        = options
-
-      concat(SimpleForm::Inputs::Base.new(f).label)
-    end)
+    with_concat_form_for(object) do |f|
+      options[:reflection] = Association.new(Company, :company, {}) if options.delete(:setup_association)
+      SimpleForm::Inputs::Base.new(f, attribute_name, nil, type, options).label
+    end
   end
 
   test 'label should generate a default humanized description' do
@@ -58,6 +53,15 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should not explode while looking for i18n translation when action is not set' do
+    def @controller.action_name; nil; end
+
+    assert_nothing_raised do
+      with_label_for @user, :description, :text
+    end
+    assert_select 'label[for=user_description]'
+  end
+
   test 'label should use i18n based on model and attribute to lookup translation' do
     store_translations(:en, :simple_form => { :labels => { :user => {
       :description => 'Descrição'
@@ -74,6 +78,15 @@ class LabelTest < ActionView::TestCase
     end
   end
 
+  test 'input should not use i18n label if translate is false' do
+    swap SimpleForm, :translate => false do
+      store_translations(:en, :simple_form => { :labels => { :age => 'Idade' } } ) do
+        with_label_for @user, :age, :integer
+        assert_select 'label[for=user_age]', /Age/
+      end
+    end
+  end
+
   test 'label should use i18n with lookup for association name' do
     store_translations(:en, :simple_form => { :labels => {
       :user => { :company => 'My company!' }

data/test/components/wrapper_test.rb

@@ -1,17 +1,16 @@
 require 'test_helper'
 
 class WrapperTest < ActionView::TestCase
-  def with_error_for(object, attribute_name, options={}, &block)
-    concat(simple_form_for(object) do |f|
-      f.options = options
+  def with_error_for(object, attribute_name, &block)
+    with_concat_form_for(object) do |f|
       f.input attribute_name
-    end)
+    end
   end
 
   def with_form_for(object, *args, &block)
-    concat(simple_form_for(object) do |f|
-      concat f.input(*args, &block)
-    end)
+    with_concat_form_for(object) do |f|
+       f.input(*args, &block)
+    end
   end
 
   test 'wrapper should not have error class for attribute without errors' do
@@ -51,4 +50,14 @@ class WrapperTest < ActionView::TestCase
       assert_no_select 'div.input'
     end
   end
+
+  test 'wrapper should not have disabled class by default' do
+    with_form_for @user, :active
+    assert_no_select 'div.disabled'
+  end
+
+  test 'wrapper should add disabled class when the input is disabled' do
+    with_form_for @user, :active, :disabled => true
+    assert_select 'div.disabled'
+  end
 end

data/test/error_notification_test.rb

@@ -1,11 +1,12 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class ErrorNotificationTest < ActionView::TestCase
 
   def with_error_notification_for(object, options={}, &block)
-    concat(simple_form_for(object) do |f|
-      concat(f.error_notification(options))
-    end)
+    with_concat_form_for(object) do |f|
+      f.error_notification(options)
+    end
   end
 
   test 'error notification is not generated when the object has no error' do

data/test/form_builder_test.rb

@@ -4,39 +4,39 @@ require 'test_helper'
 class FormBuilderTest < ActionView::TestCase
 
   def with_form_for(object, *args, &block)
-    concat(simple_form_for(object) do |f|
-      concat f.input(*args, &block)
-    end)
+    with_concat_form_for(object) do |f|
+      f.input(*args, &block)
+    end
   end
 
   def with_button_for(object, *args)
-    concat(simple_form_for(object) do |f|
-      concat f.button(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.button(*args)
+    end
   end
 
   def with_error_for(object, *args)
-    concat(simple_form_for(object) do |f|
-      concat f.error(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.error(*args)
+    end
   end
 
   def with_hint_for(object, *args)
-    concat(simple_form_for(object) do |f|
-      concat f.hint(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.hint(*args)
+    end
   end
 
   def with_label_for(object, *args)
-    concat(simple_form_for(object) do |f|
-      concat f.label(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.label(*args)
+    end
   end
 
   def with_association_for(object, *args)
-    concat(simple_form_for(object) do |f|
-      concat f.association(*args)
-    end)
+    with_concat_form_for(object) do |f|
+      f.association(*args)
+    end
   end
 
   # All
@@ -56,12 +56,28 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder input should allow a block to configure input' do
     with_form_for @user, :name do
-      concat text_field_tag :foo, :bar, :id => :cool
+      text_field_tag :foo, :bar, :id => :cool
     end
     assert_no_select 'input.string'
     assert_select 'input#cool'
   end
 
+  test 'builder should allow adding custom input mappings for default input types' do
+    swap SimpleForm, :input_mappings => { /count$/ => :integer } do
+      with_form_for @user, :post_count
+      assert_no_select 'form input#user_post_count.string'
+      assert_select 'form input#user_post_count.numeric.integer'
+    end
+  end
+
+  test 'builder uses the first matching custom input map when more than one match' do
+    swap SimpleForm, :input_mappings => { /count$/ => :integer, /^post_/ => :password } do
+      with_form_for @user, :post_count
+      assert_no_select 'form input#user_post_count.password'
+      assert_select 'form input#user_post_count.numeric.integer'
+    end
+  end
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name
@@ -108,6 +124,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_email.string.email'
   end
 
+  test 'builder should generate tel fields for columns that matches phone' do
+    with_form_for @user, :phone_number
+    assert_select 'form input#user_phone_number.string.tel'
+  end
+
   test 'builder should generate url fields for columns that matches url' do
     with_form_for @user, :url
     assert_select 'form input#user_url.string.url'
@@ -230,10 +251,19 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error#cool', "can't be blank"
   end
 
+  test 'placeholder should not be generated when set to false' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+      with_form_for @user, :name, :placeholder => false
+      assert_no_select 'input[placeholder]'
+    end
+  end
+
   # REQUIRED AND PRESENCE VALIDATION
   test 'builder input should obtain required from ActiveModel::Validations when it is included' do
     with_form_for @validating_user, :name
-    assert_select 'input.required#validating_user_name'
+    assert_select 'input.required[required]#validating_user_name'
     with_form_for @validating_user, :status
     assert_select 'input.optional#validating_user_status'
   end
@@ -242,24 +272,26 @@ class FormBuilderTest < ActionView::TestCase
     with_form_for @validating_user, :name, :required => false
     assert_select 'input.optional#validating_user_name'
     with_form_for @validating_user, :status, :required => true
-    assert_select 'input.required#validating_user_status'
+    assert_select 'input.required[required]#validating_user_status'
   end
 
   test 'builder input should be required by default when ActiveModel::Validations is not included' do
     with_form_for @user, :name
-    assert_select 'input.required#user_name'
+    assert_select 'input.required[required]#user_name'
   end
 
   test 'builder input should not be required by default when ActiveModel::Validations is not included if option is set to false' do
     swap SimpleForm, :required_by_default => false do
       with_form_for @user, :name
       assert_select 'input.optional#user_name'
+      assert_no_select 'input[required]'
     end
   end
 
   test 'builder input should allow disabling required when ActiveModel::Validations is not included' do
     with_form_for @user, :name, :required => false
     assert_no_select 'input.required'
+    assert_no_select 'input[required]'
     assert_select 'input.optional#user_name'
   end
 
@@ -290,16 +322,16 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder allows wrapper tag to be given on demand' do
-    concat(simple_form_for(@user) do |f|
-      concat f.input :name, :wrapper_tag => :b
-    end)
+    with_concat_form_for(@user) do |f|
+      f.input :name, :wrapper_tag => :b
+    end
     assert_select 'form b.required.string'
   end
 
   test 'builder allows wrapper class to be given on demand' do
-    concat(simple_form_for(@user) do |f|
-      concat f.input :name, :wrapper_class => :wrapper
-    end)
+    with_concat_form_for(@user) do |f|
+      f.input :name, :wrapper_class => :wrapper
+    end
     assert_select 'form div.wrapper.required.string'
   end
 
@@ -353,9 +385,9 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should generate a hint component tag for the given text' do
-     with_hint_for @user, 'Hello World!'
-     assert_select 'span.hint', 'Hello World!'
-   end
+    with_hint_for @user, 'Hello World!'
+    assert_select 'span.hint', 'Hello World!'
+  end
 
   test 'builder should allow passing options to hint tag' do
     with_hint_for @user, :name, :hint => 'Hello World!', :id => 'name_hint'
@@ -370,7 +402,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should add a required class to label if the attribute is required' do
     with_label_for @validating_user, :name
-    assert_select 'label.string[for=validating_user_name]', /Name/
+    assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
   test 'builder should allow passing options to label tag' do
@@ -394,13 +426,13 @@ class FormBuilderTest < ActionView::TestCase
   # BUTTONS
   test 'builder should create buttons' do
     with_button_for :post, :submit
-    assert_select 'form input[type=submit][value=Save Post]'
+    assert_select 'form input.button[type=submit][value=Save Post]'
   end
 
   test 'builder should create buttons for records' do
     @user.new_record!
     with_button_for @user, :submit
-    assert_select 'form input[type=submit][value=Create User]'
+    assert_select 'form input.button[type=submit][value=Create User]'
   end
 
   # ASSOCIATIONS
@@ -429,6 +461,13 @@ class FormBuilderTest < ActionView::TestCase
     assert_equal 3, calls
   end
 
+  test 'builder association mark input as required based both association and attribute' do
+    swap SimpleForm, :required_by_default => false do
+      with_association_for @validating_user, :company, :collection => []
+      assert_select 'label.required'
+    end
+  end
+
   # ASSOCIATIONS - BELONGS TO
   test 'builder creates a select for belongs_to associations' do
     with_association_for @user, :company
@@ -515,4 +554,12 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input[type=checkbox][value=2][checked=checked]'
     assert_no_select 'form input[type=checkbox][value=3][checked=checked]'
   end
+
+  test 'builder with collection support giving collection and item wrapper tags' do
+    with_association_for @user, :tags, :as => :check_boxes,
+      :collection_wrapper_tag => :ul, :item_wrapper_tag => :li
+
+    assert_select 'form ul', :count => 1
+    assert_select 'form ul li', :count => 3
+  end
 end

data/test/inputs_test.rb

@@ -8,9 +8,9 @@ class InputTest < ActionView::TestCase
   end
 
   def with_input_for(object, attribute_name, type, options={})
-    concat(simple_form_for(object) do |f|
-      concat f.input(attribute_name, options.merge(:as => type))
-    end)
+    with_concat_form_for(object) do |f|
+      f.input(attribute_name, options.merge(:as => type))
+    end
   end
 
   # ALL
@@ -27,6 +27,67 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
+  test 'input should generate disabled elements based on the disabled option' do
+    with_input_for @user, :name, :string, :disabled => true
+    assert_select 'input.string[disabled]'
+    with_input_for @user, :description, :text, :disabled => true
+    assert_select 'textarea.text[disabled]'
+    with_input_for @user, :age, :integer, :disabled => true
+    assert_select 'input.integer[disabled]'
+    with_input_for @user, :born_at, :date, :disabled => true
+    assert_select 'select.date[disabled]'
+    with_input_for @user, :created_at, :datetime, :disabled => true
+    assert_select 'select.datetime[disabled]'
+
+    with_input_for @user, :name, :string, :disabled => false
+    assert_select 'input.string:not([disabled])'
+    with_input_for @user, :description, :text, :disabled => false
+    assert_select 'textarea.text:not([disabled])'
+    with_input_for @user, :age, :integer, :disabled => false
+    assert_select 'input.integer:not([disabled])'
+    with_input_for @user, :born_at, :date, :disabled => false
+    assert_select 'select.date:not([disabled])'
+    with_input_for @user, :created_at, :datetime, :disabled => false
+    assert_select 'select.datetime:not([disabled])'
+
+    with_input_for @user, :name, :string
+    assert_select 'input.string:not([disabled])'
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text:not([disabled])'
+    with_input_for @user, :age, :integer
+    assert_select 'input.integer:not([disabled])'
+    with_input_for @user, :born_at, :date
+    assert_select 'select.date:not([disabled])'
+    with_input_for @user, :created_at, :datetime
+    assert_select 'select.datetime:not([disabled])'
+  end
+
+  test 'input should render components according to an optional :components option' do
+    with_input_for @user, :name, :string, :components => [:input, :label]
+    assert_select 'input + label'
+
+    with_input_for @user, :age, :integer, :components => [:input, :label]
+    assert_select 'input + label'
+
+    with_input_for @user, :active, :boolean, :components => [:label, :input]
+    assert_select 'label + input'
+
+    with_input_for @user, :description, :text, :components => [:input, :label]
+    assert_select 'textarea + label'
+
+    with_input_for @user, :password, :password, :components => [:input, :label]
+    assert_select 'input + label'
+
+    with_input_for @user, :name, :file, :components => [:input, :label]
+    assert_select 'input + label'
+
+    with_input_for @user, :country, :country, :components => [:input, :label]
+    assert_select 'select + label'
+
+    with_input_for @user, :time_zone, :time_zone, :components => [:input, :label]
+    assert_select 'select + label'
+  end
+
   # StringInput
   test 'input should map text field to string attribute' do
     with_input_for @user, :name, :string
@@ -48,6 +109,32 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[size=50]'
   end
 
+  test 'input should not generate placeholder by default' do
+    with_input_for @user, :name, :string
+    assert_no_select 'input[placeholder]'
+  end
+
+  test 'input should accept the placeholder option' do
+    with_input_for @user, :name, :string, :placeholder => 'Put in some text'
+    assert_select 'input.string[placeholder=Put in some text]'
+  end
+
+  test 'input should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+      with_input_for @user, :name, :string
+      assert_select 'input.string[placeholder=Name goes here]'
+    end
+  end
+
+  [:email, :url, :search, :tel].each do |type|
+    test "input should allow type #{type}" do
+      with_input_for @user, :name, type
+      assert_select "input.string.#{type}"
+    end
+  end
+
   # NumericInput
   test 'input should generate an integer text field for integer attributes ' do
     with_input_for @user, :age, :integer
@@ -64,6 +151,71 @@ class InputTest < ActionView::TestCase
     assert_select 'input[type=number].decimal#user_age'
   end
 
+  test 'input should not generate min attribute by default' do
+    with_input_for @user, :age, :integer
+    assert_no_select 'input[min]'
+  end
+
+  test 'input should not generate max attribute by default' do
+    with_input_for @user, :age, :integer
+    assert_no_select 'input[max]'
+  end
+
+  test 'input should infer min value from integer attributes with greater than validation' do
+    with_input_for @other_validating_user, :age, :float
+    assert_no_select 'input[min]'
+
+    with_input_for @other_validating_user, :age, :integer
+    assert_select 'input[min=18]'
+  end
+
+  test 'input should infer max value from attributes with less than validation' do
+    with_input_for @other_validating_user, :age, :float
+    assert_no_select 'input[max]'
+
+    with_input_for @other_validating_user, :age, :integer
+    assert_select 'input[max=99]'
+  end
+
+  test 'input should infer step value only from integer attribute' do
+    with_input_for @validating_user, :age, :float
+    assert_no_select 'input[step]'
+
+    with_input_for @validating_user, :age, :integer
+    assert_select 'input[step=1]'
+  end
+
+  test 'numeric input should not generate placeholder by default' do
+    with_input_for @user, :age, :integer
+    assert_no_select 'input[placeholder]'
+  end
+
+  test 'numeric input should accept the placeholder option' do
+    with_input_for @user, :age, :integer, :placeholder => 'Put in your age'
+    assert_select 'input.integer[placeholder=Put in your age]'
+  end
+
+  test 'numeric input should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :age => 'Age goes here'
+    } } }) do
+      with_input_for @user, :age, :integer
+      assert_select 'input.integer[placeholder=Age goes here]'
+    end
+  end
+
+  [:integer, :float, :decimal].each do |type|
+    test "#{type} input should infer min value from attributes with greater than or equal validation" do
+      with_input_for @validating_user, :age, type
+      assert_select 'input[min=18]'
+    end
+
+    test "#{type} input should infer the max value from attributes with less than or equal to validation" do
+      with_input_for @validating_user, :age, type
+      assert_select 'input[max=99]'
+    end
+  end
+
   # BooleanInput
   test 'input should generate a checkbox by default for boolean attributes' do
     with_input_for @user, :active, :boolean
@@ -77,16 +229,39 @@ class InputTest < ActionView::TestCase
     assert_select 'textarea.text#user_description'
   end
 
+  test 'input should generate a text area for text attributes that accept placeholder' do
+    with_input_for @user, :description, :text, :placeholder => 'Put in some text'
+    assert_select 'textarea.text[placeholder=Put in some text]'
+  end
+
   test 'input should generate a password field for password attributes' do
     with_input_for @user, :password, :password
     assert_select 'input[type=password].password#user_password'
   end
 
+  test 'input should generate a password field for password attributes that accept placeholder' do
+    with_input_for @user, :password, :password, :placeholder => 'Password Confirmation'
+    assert_select 'input[type=password].password[placeholder=Password Confirmation]#user_password'
+  end
+
   test 'input should generate a file field' do
     with_input_for @user, :name, :file
     assert_select 'input#user_name[type=file]'
   end
 
+  test "input should generate a file field that don't accept placeholder" do
+    with_input_for @user, :name, :file, :placeholder => 'Put in some text'
+    assert_no_select 'input[placeholder]'
+  end
+
+  test 'mapping input should generate an error if type is not found' do
+    with_concat_form_for(@user) do |f|
+      assert_raise(RuntimeError, "Could not find method for nil") do
+        SimpleForm::Inputs::MappingInput.new(f, "unknown", nil, nil, {}).input
+      end
+    end
+  end
+
   # HiddenInput
   test 'input should generate a hidden field' do
     with_input_for @user, :name, :hidden
@@ -104,6 +279,14 @@ class InputTest < ActionView::TestCase
     assert_no_select 'label'
   end
 
+  test 'required/optional options should not be generated for hidden inputs' do
+    with_input_for @user, :name, :hidden
+    assert_no_select 'input.required'
+    assert_no_select 'input[required]'
+    assert_no_select 'input.optional'
+    assert_select 'input.hidden#user_name'
+  end
+
   # PriorityInput
   test 'input should generate a country select field' do
     with_input_for @user, :country, :country
@@ -267,6 +450,28 @@ class InputTest < ActionView::TestCase
     assert_select 'select option[selected=selected]', '18'
   end
 
+  test 'input should set the correct value when using a collection that includes floats' do
+    with_input_for @user, :age, :select, :collection => [2.0, 2.5, 3.0, 3.5, 4.0, 4.5]
+    assert_select 'select option[value="2.0"]'
+    assert_select 'select option[value="2.5"]'
+  end
+
+  test 'input should set the correct values when using a collection that uses mixed values' do
+    with_input_for @user, :age, :select, :collection => ["Hello Kitty", 2, 4.5, :johnny, nil, true, false]
+    assert_select 'select option[value="Hello Kitty"]'
+    assert_select 'select option[value="2"]'
+    assert_select 'select option[value="4.5"]'
+    assert_select 'select option[value="johnny"]'
+    assert_select 'select option[value=""]'
+    assert_select 'select option[value="true"]'
+    assert_select 'select option[value="false"]'
+  end
+
+  test 'input should include a blank option even if :include_blank is set to false if the collection includes a nil value' do
+    with_input_for @user, :age, :select, :collection => [nil], :include_blank => false
+    assert_select 'select option[value=""]'
+  end
+
   test 'input should automatically set include blank' do
     with_input_for @user, :age, :select, :collection => 18..30
     assert_select 'select option[value=]', ''
@@ -316,6 +521,22 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'Carlos'
   end
 
+  test 'input should allow overriding only label method for collections' do
+    with_input_for @user, :name, :radio,
+                          :collection => ['Jose' , 'Carlos'],
+                          :label_method => :upcase
+    assert_select 'label.collection_radio', 'JOSE'
+    assert_select 'label.collection_radio', 'CARLOS'
+  end
+
+  test 'input should allow overriding only value method for collections' do
+    with_input_for @user, :name, :radio,
+                          :collection => ['Jose' , 'Carlos'],
+                          :value_method => :upcase
+    assert_select 'input[type=radio][value=JOSE]'
+    assert_select 'input[type=radio][value=CARLOS]'
+  end
+
   test 'input should allow overriding label and value method for collections' do
     with_input_for @user, :name, :radio,
                           :collection => ['Jose' , 'Carlos'],
@@ -327,6 +548,24 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'CARLOS'
   end
 
+  test 'input should allow overriding label and value method using a lambda for collections' do
+    with_input_for @user, :name, :radio,
+                          :collection => ['Jose' , 'Carlos'],
+                          :label_method => lambda { |i| i.upcase },
+                          :value_method => lambda { |i| i.downcase }
+    assert_select 'input[type=radio][value=jose]'
+    assert_select 'input[type=radio][value=carlos]'
+    assert_select 'label.collection_radio', 'JOSE'
+    assert_select 'label.collection_radio', 'CARLOS'
+  end
+
+  test 'input should allow symbols for collections' do
+    with_input_for @user, :name, :select, :collection => [:jose, :carlos]
+    assert_select 'select.select#user_name'
+    assert_select 'select option[value=jose]', 'jose'
+    assert_select 'select option[value=carlos]', 'carlos'
+  end
+
   # With no object
   test 'input should be generated properly when object is not present' do
     with_input_for :project, :name, :string