simple_form 1.2.0 → 1.2.1

data/test/action_view_extensions/form_helper_test.rb

@@ -9,28 +9,28 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'simple form should add default class to form' do
-    concat(simple_form_for :user do |f| end)
+    concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form'
   end
 
   test 'simple form should add object name as css class to form when object is not present' do
-    concat(simple_form_for :user do |f| end)
+    concat(simple_form_for(:user) do |f| end)
     assert_select 'form.simple_form.user'
   end
 
   test 'simple form should add object class name as css class to form' do
-    concat(simple_form_for @user do |f| end)
+    concat(simple_form_for(@user) do |f| end)
     assert_select 'form.simple_form.user'
   end
 
   test 'pass options to simple form' do
-    concat(simple_form_for :user, :url => '/account', :html => { :id => 'my_form' } do |f| end)
+    concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
     assert_select 'form#my_form'
     assert_select 'form[action=/account]'
   end
 
   test 'fields for yields an instance of FormBuilder' do
-    concat(simple_fields_for :user do |f|
+    concat(simple_fields_for(:user) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
     end)
   end

data/test/components/error_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ErrorTest < ActionView::TestCase
 
   def with_error_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for object do |f|
+    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
@@ -28,9 +28,18 @@ class ErrorTest < ActionView::TestCase
     assert_select 'span.error', "can't be blank"
   end
 
-  test 'error should generate messages for attribute with several errors' do
-    with_error_for @user, :age, :numeric
-    assert_select 'span.error', 'is not a number and must be greater than 18'
+  test 'error should generate messages for attribute with one error when using first' do
+    swap SimpleForm, :error_method => :first do
+      with_error_for @user, :age, :numeric
+      assert_select 'span.error', 'is not a number'
+    end
+  end
+
+  test 'error should generate messages for attribute with several errors when using to_sentence' do
+    swap SimpleForm, :error_method => :to_sentence do
+      with_error_for @user, :age, :numeric
+      assert_select 'span.error', 'is not a number and must be greater than 18'
+    end
   end
 
   test 'error should be able to pass html options' do
@@ -39,7 +48,7 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'error should find errors on attribute and association' do
-    with_error_for @user, :company_id, :select, :setup_association => true
+    with_error_for @user, :company_id, :select, :setup_association => true, :error_method => :to_sentence
     assert_select 'span.error', 'must be valid and company must be present'
   end
 end

data/test/components/hint_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class HintTest < ActionView::TestCase
 
   def with_hint_for(object, attribute_name, type, options={}, &block)
-    concat(simple_form_for object do |f|
+    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

data/test/components/label_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class LabelTest < ActionView::TestCase
@@ -7,7 +8,7 @@ class LabelTest < ActionView::TestCase
   end
 
   def with_label_for(object, attribute_name, type, options={})
-    concat(simple_form_for object do |f|
+    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
@@ -94,14 +95,14 @@ class LabelTest < ActionView::TestCase
     with_label_for @user, :created_at, :datetime
     assert_select 'label.datetime'
   end
-  
+
   test 'label should obtain required from ActiveModel::Validations when it is included' do
     with_label_for @validating_user, :name, :string
     assert_select 'label.required'
     with_label_for @validating_user, :status, :string
     assert_select 'label.optional'
   end
-  
+
   test 'label should allow overriding required when ActiveModel::Validations is included' do
     with_label_for @validating_user, :name, :string, :required => false
     assert_select 'label.optional'

data/test/components/wrapper_test.rb

@@ -0,0 +1,54 @@
+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
+      f.input attribute_name
+    end)
+  end
+
+  def with_form_for(object, *args, &block)
+    concat(simple_form_for(object) do |f|
+      concat f.input(*args, &block)
+    end)
+  end
+
+  test 'wrapper should not have error class for attribute without errors' do
+    with_error_for @user, :active
+    assert_no_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should not have error class when object is not present' do
+    with_error_for :project, :name
+    assert_no_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should add error class for attribute with errors' do
+    with_error_for @user, :name
+    assert_select 'div.field_with_errors'
+  end
+
+  test 'wrapper should add chosen error class for attribute with errors' do
+    swap SimpleForm, :wrapper_error_class => "omgError" do
+      with_error_for @user, :name
+      assert_select 'div.omgError'
+    end
+  end
+
+  test 'wrapper should add chosen wrapper class' do
+    swap SimpleForm, :wrapper_class => "wrapper" do
+      with_form_for @user, :active
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+
+      with_form_for @user, :name
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+
+      with_form_for :project, :name
+      assert_select 'div.wrapper'
+      assert_no_select 'div.input'
+    end
+  end
+end

data/test/error_notification_test.rb

@@ -0,0 +1,61 @@
+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)
+  end
+
+  test 'error notification is not generated when the object has no error' do
+    assert @validating_user.valid?
+    with_error_notification_for @validating_user
+    assert_no_select 'p.error_notification'
+  end
+
+  test 'error notification is not generated for forms without objects' do
+    with_error_notification_for :user
+    assert_no_select 'p.error_notification'
+  end
+
+  test 'error notification is generated when the object has some error' do
+    with_error_notification_for @user
+    assert_select 'p.error_notification', 'Some errors were found, please take a look:'
+  end
+
+  test 'error notification uses I18n based on model to generate the notification message' do
+    store_translations(:en, :simple_form => { :error_notification => { :user =>
+      'Alguns erros foram encontrados para o usuário:'
+    } }) do
+      with_error_notification_for @user
+      assert_select 'p.error_notification', 'Alguns erros foram encontrados para o usuário:'
+    end
+  end
+
+  test 'error notification uses I18n fallbacking to default message' do
+    store_translations(:en, :simple_form => { :error_notification => {
+      :default_message => 'Opa! Alguns erros foram encontrados, poderia verificar?'
+    } }) do
+      with_error_notification_for @user
+      assert_select 'p.error_notification', 'Opa! Alguns erros foram encontrados, poderia verificar?'
+    end
+  end
+
+  test 'error notification allows passing the notification message' do
+    with_error_notification_for @user, :message => 'Erro encontrado ao criar usuario'
+    assert_select 'p.error_notification', 'Erro encontrado ao criar usuario'
+  end
+
+  test 'error notification accepts other html options' do
+    with_error_notification_for @user, :id => 'user_error_message', :class => 'form_error'
+    assert_select 'p#user_error_message.form_error.error_notification'
+  end
+
+  test 'error notification allows configuring the wrapper element' do
+    swap SimpleForm, :error_notification_tag => :div do
+      with_error_notification_for @user
+      assert_select 'div.error_notification'
+    end
+  end
+end

data/test/form_builder_test.rb

@@ -1,39 +1,40 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class FormBuilderTest < ActionView::TestCase
 
   def with_form_for(object, *args, &block)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.input(*args, &block)
     end)
   end
 
   def with_button_for(object, *args)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.button(*args)
     end)
   end
 
   def with_error_for(object, *args)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.error(*args)
     end)
   end
 
   def with_hint_for(object, *args)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.hint(*args)
     end)
   end
 
   def with_label_for(object, *args)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.label(*args)
     end)
   end
 
   def with_association_for(object, *args)
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.association(*args)
     end)
   end
@@ -229,26 +230,33 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'span.error#cool', "can't be blank"
   end
 
-  # REQUIRED AND PRESENCE VALIDATION 
+  # 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'
     with_form_for @validating_user, :status
     assert_select 'input.optional#validating_user_status'
   end
-  
+
   test 'builder input should allow overriding required when ActiveModel::Validations is included' do
     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'
   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'
   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'
+    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'
@@ -282,12 +290,24 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder allows wrapper tag to be given on demand' do
-    concat(simple_form_for @user do |f|
+    concat(simple_form_for(@user) do |f|
       concat 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)
+    assert_select 'form div.wrapper.required.string'
+  end
+
+  test 'builder wrapping tag adds errors class for attribute with errors' do
+    with_form_for @user, :name
+    assert_select 'form div.input.required.string.field_with_errors'
+  end
+
   # WITHOUT OBJECT
   test 'builder should generate properly when object is not present' do
     with_form_for :project, :name

data/test/inputs_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 
 class InputTest < ActionView::TestCase
@@ -5,13 +6,13 @@ class InputTest < ActionView::TestCase
   setup do
     SimpleForm::Inputs::CollectionInput.reset_i18n_cache :boolean_collection
   end
-  
+
   def with_input_for(object, attribute_name, type, options={})
-    concat(simple_form_for object do |f|
+    concat(simple_form_for(object) do |f|
       concat f.input(attribute_name, options.merge(:as => type))
     end)
   end
-  
+
   # ALL
   test 'input should generate css class based on default input type' do
     with_input_for @user, :name, :string
@@ -26,27 +27,12 @@ class InputTest < ActionView::TestCase
     assert_select 'select.datetime'
   end
 
-  # TextFieldInput
+  # StringInput
   test 'input should map text field to string attribute' do
     with_input_for @user, :name, :string
     assert_select 'input[name=\'user[name]\'][id=user_name][value=New in Simple Form!][type=text]'
   end
 
-  test 'input should generate an integer text field for integer attributes ' do
-    with_input_for @user, :age, :integer
-    assert_select 'input[type=text].integer#user_age'
-  end
-  
-  test 'input should generate a float text field for float attributes ' do
-    with_input_for @user, :age, :float
-    assert_select 'input[type=text].float#user_age'
-  end
-  
-  test 'input should generate a decimal text field for decimal attributes ' do
-    with_input_for @user, :age, :decimal
-    assert_select 'input[type=text].decimal#user_age'
-  end
-
   test 'input should use default text size for decimal attributes' do
     with_input_for @user, :credit_limit, :decimal
     assert_select 'input.decimal[size=50]'
@@ -62,17 +48,35 @@ class InputTest < ActionView::TestCase
     assert_select 'input.string[size=50]'
   end
 
-  # MappingInput
-  test 'input should generate a text area for text attributes' do
-    with_input_for @user, :description, :text
-    assert_select 'textarea.text#user_description'
+  # NumericInput
+  test 'input should generate an integer text field for integer attributes ' do
+    with_input_for @user, :age, :integer
+    assert_select 'input[type=number].integer#user_age'
+  end
+
+  test 'input should generate a float text field for float attributes ' do
+    with_input_for @user, :age, :float
+    assert_select 'input[type=number].float#user_age'
   end
 
+  test 'input should generate a decimal text field for decimal attributes ' do
+    with_input_for @user, :age, :decimal
+    assert_select 'input[type=number].decimal#user_age'
+  end
+
+  # BooleanInput
   test 'input should generate a checkbox by default for boolean attributes' do
     with_input_for @user, :active, :boolean
     assert_select 'input[type=checkbox].boolean#user_active'
+    assert_select 'input.boolean + label.boolean.optional'
+  end
+
+  # MappingInput
+  test 'input should generate a text area for text attributes' do
+    with_input_for @user, :description, :text
+    assert_select 'textarea.text#user_description'
   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'
@@ -107,7 +111,7 @@ class InputTest < ActionView::TestCase
     assert_select 'select option[value=Brazil]', 'Brazil'
     assert_no_select 'select option[value=][disabled=disabled]'
   end
-  
+
   test 'input should generate a country select with simple form default' do
     swap SimpleForm, :country_priority => [ 'Brazil' ] do
       with_input_for @user, :country, :country
@@ -141,17 +145,17 @@ class InputTest < ActionView::TestCase
       assert_select "form select.datetime#user_created_at_#{i}i"
     end
   end
-  
+
   test 'input should be able to pass options to datetime select' do
     with_input_for @user, :created_at, :datetime,
       :disabled => true, :prompt => { :year => 'ano', :month => 'mês', :day => 'dia' }
-  
+
     assert_select 'select.datetime[disabled=disabled]'
     assert_select 'select.datetime option', 'ano'
     assert_select 'select.datetime option', 'mês'
     assert_select 'select.datetime option', 'dia'
   end
-  
+
   test 'input should generate a date select for date attributes' do
     with_input_for @user, :born_at, :date
     assert_select 'select.date#user_born_at_1i'
@@ -159,11 +163,11 @@ class InputTest < ActionView::TestCase
     assert_select 'select.date#user_born_at_3i'
     assert_no_select 'select.date#user_born_at_4i'
   end
-  
+
   test 'input should be able to pass options to date select' do
     with_input_for @user, :born_at, :date, :as => :date,
       :disabled => true, :prompt => { :year => 'ano', :month => 'mês', :day => 'dia' }
-  
+
     assert_select 'select.date[disabled=disabled]'
     assert_select 'select.date option', 'ano'
     assert_select 'select.date option', 'mês'
@@ -183,11 +187,11 @@ class InputTest < ActionView::TestCase
     assert_select 'select.time#user_delivery_time_4i'
     assert_select 'select.time#user_delivery_time_5i'
   end
-  
+
   test 'input should be able to pass options to time select' do
     with_input_for @user, :delivery_time, :time, :required => true,
       :disabled => true, :prompt => { :hour => 'hora', :minute => 'minuto' }
-  
+
     assert_select 'select.time[disabled=disabled]'
     assert_select 'select.time option', 'hora'
     assert_select 'select.time option', 'minuto'
@@ -214,13 +218,13 @@ class InputTest < ActionView::TestCase
     assert_select 'input[type=radio][value=true].radio#user_active_true'
     assert_select 'input[type=radio][value=false].radio#user_active_false'
   end
-  
+
   test 'input as radio should generate internal labels by default' do
     with_input_for @user, :active, :radio
     assert_select 'label[for=user_active_true]', 'Yes'
     assert_select 'label[for=user_active_false]', 'No'
   end
-  
+
   test 'input as radio should use i18n to translate internal labels' do
     store_translations(:en, :simple_form => { :yes => 'Sim', :no => 'Não' }) do
       with_input_for @user, :active, :radio
@@ -228,14 +232,14 @@ class InputTest < ActionView::TestCase
       assert_select 'label[for=user_active_false]', 'Não'
     end
   end
-  
+
   test 'input should generate a boolean select with options by default for select types' do
     with_input_for @user, :active, :select
     assert_select 'select.select#user_active'
     assert_select 'select option[value=true]', 'Yes'
     assert_select 'select option[value=false]', 'No'
   end
-  
+
   test 'input as select should use i18n to translate select boolean options' do
     store_translations(:en, :simple_form => { :yes => 'Sim', :no => 'Não' }) do
       with_input_for @user, :active, :select
@@ -243,53 +247,53 @@ class InputTest < ActionView::TestCase
       assert_select 'select option[value=false]', 'Não'
     end
   end
-  
+
   test 'input should allow overriding collection for select types' do
     with_input_for @user, :name, :select, :collection => ['Jose', 'Carlos']
     assert_select 'select.select#user_name'
     assert_select 'select option', 'Jose'
     assert_select 'select option', 'Carlos'
   end
-  
+
   test 'input should mark the selected value by default' do
     @user.name = "Carlos"
     with_input_for @user, :name, :select, :collection => ['Jose', 'Carlos']
     assert_select 'select option[selected=selected]', 'Carlos'
   end
-  
+
   test 'input should mark the selected value also when using integers' do
     @user.age = 18
     with_input_for @user, :age, :select, :collection => 18..60
     assert_select 'select option[selected=selected]', '18'
   end
-  
+
   test 'input should automatically set include blank' do
     with_input_for @user, :age, :select, :collection => 18..30
     assert_select 'select option[value=]', ''
   end
-  
+
   test 'input should not set include blank if otherwise is told' do
     with_input_for @user, :age, :select, :collection => 18..30, :include_blank => false
     assert_no_select 'select option[value=]', ''
   end
-  
+
   test 'input should not set include blank if prompt is given' do
     with_input_for @user, :age, :select, :collection => 18..30, :prompt => "Please select foo"
     assert_no_select 'select option[value=]', ''
   end
-  
+
   test 'input should not set include blank if multiple is given' do
     with_input_for @user, :age, :select, :collection => 18..30, :input_html => { :multiple => true }
     assert_no_select 'select option[value=]', ''
   end
-  
+
   test 'input should detect label and value on collections' do
     users = [ setup_new_user(:id => 1, :name => "Jose"), setup_new_user(:id => 2, :name => "Carlos") ]
     with_input_for @user, :description, :select, :collection => users
     assert_select 'select option[value=1]', 'Jose'
     assert_select 'select option[value=2]', 'Carlos'
   end
-  
+
   test 'input should allow overriding collection for radio types' do
     with_input_for @user, :name, :radio, :collection => ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Jose]'
@@ -297,13 +301,13 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'Jose'
     assert_select 'label.collection_radio', 'Carlos'
   end
-  
+
   test 'input should mark the current radio value by default' do
     @user.name = "Carlos"
     with_input_for @user, :name, :radio, :collection => ['Jose', 'Carlos']
     assert_select 'input[type=radio][value=Carlos][checked=checked]'
   end
-  
+
   test 'input should allow using a collection with text/value arrays' do
     with_input_for @user, :name, :radio, :collection => [['Jose', 'jose'], ['Carlos', 'carlos']]
     assert_select 'input[type=radio][value=jose]'
@@ -311,7 +315,7 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'Jose'
     assert_select 'label.collection_radio', 'Carlos'
   end
-  
+
   test 'input should allow overriding label and value method for collections' do
     with_input_for @user, :name, :radio,
                           :collection => ['Jose' , 'Carlos'],
@@ -322,19 +326,19 @@ class InputTest < ActionView::TestCase
     assert_select 'label.collection_radio', 'JOSE'
     assert_select 'label.collection_radio', 'CARLOS'
   end
-  
+
   # With no object
   test 'input should be generated properly when object is not present' do
     with_input_for :project, :name, :string
     assert_select 'input.string.required#project_name'
   end
-  
+
   test 'input as radio should be generated properly when object is not present ' do
     with_input_for :project, :name, :radio
     assert_select 'input.radio#project_name_true'
     assert_select 'input.radio#project_name_false'
   end
-  
+
   test 'input as select with collection should be generated properly when object is not present' do
     with_input_for :project, :name, :select, :collection => ['Jose', 'Carlos']
     assert_select 'select.select#project_name'