simple_form 2.0.0 → 2.1.0

data/test/action_view_extensions/form_helper_test.rb

@@ -9,96 +9,135 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'SimpleForm should add default class to form' do
-    concat(simple_form_for(:user) do |f| end)
+    with_concat_form_for(:user)
     assert_select 'form.simple_form'
   end
 
   test 'SimpleForm should use default browser validations by default' do
-    concat(simple_form_for(:user) do |f| end)
+    with_concat_form_for(:user)
     assert_no_select 'form[novalidate]'
   end
 
   test 'SimpleForm should not use default browser validations if specified in the configuration options' do
     swap SimpleForm, :browser_validations => false do
-      concat(simple_form_for(:user) do |f| end)
+      with_concat_form_for(:user)
       assert_select 'form[novalidate="novalidate"]'
     end
   end
 
   test 'a form specific disabled validation option should override the default enabled browser validation configuration option' do
-    concat(simple_form_for(:user, :html => { :novalidate => true }) do |f| end)
+    with_concat_form_for(:user, :html => { :novalidate => true })
     assert_select 'form[novalidate="novalidate"]'
   end
 
   test 'a form specific enabled validation option should override the disabled browser validation configuration option' do
     swap SimpleForm, :browser_validations => false do
-      concat(simple_form_for(:user, :html => { :novalidate => false }) do |f| end)
+      with_concat_form_for(:user, :html => { :novalidate => false })
       assert_no_select 'form[novalidate]'
     end
   end
 
   test 'SimpleForm should add object name as css class to form when object is not present' do
-    concat(simple_form_for(:user) do |f| end)
+    with_concat_form_for(:user, :html => { :novalidate => true })
     assert_select 'form.simple_form.user'
   end
 
   test 'SimpleForm should add :as option as css class to form when object is not present' do
-    concat(simple_form_for(:user, :as => 'superuser') do |f| end)
+    with_concat_form_for(:user, :as => 'superuser')
     assert_select 'form.simple_form.superuser'
   end
 
   test 'SimpleForm should add object class name with new prefix as css class to form if record is not persisted' do
     @user.new_record!
-    concat(simple_form_for(@user) do |f| end)
+    with_concat_form_for(@user)
     assert_select 'form.simple_form.new_user'
   end
 
   test 'SimpleForm should add :as option with new prefix as css class to form if record is not persisted' do
     @user.new_record!
-    concat(simple_form_for(@user, :as => 'superuser') do |f| end)
+    with_concat_form_for(@user, :as => 'superuser')
     assert_select 'form.simple_form.new_superuser'
   end
 
   test 'SimpleForm should add edit class prefix as css class to form if record is persisted' do
-    concat(simple_form_for(@user) do |f| end)
+    with_concat_form_for(@user)
     assert_select 'form.simple_form.edit_user'
   end
 
   test 'SimpleForm should add :as options with edit prefix as css class to form if record is persisted' do
-    concat(simple_form_for(@user, :as => 'superuser') do |f| end)
+    with_concat_form_for(@user, :as => 'superuser')
     assert_select 'form.simple_form.edit_superuser'
   end
 
+  test 'SimpleForm should add last object name as css class to form when there is array of objects' do
+    with_concat_form_for([Company.new, @user])
+    assert_select 'form.simple_form.edit_user'
+  end
+
   test 'SimpleForm should not add object class to form if css_class is specified' do
-    concat(simple_form_for(:user, :html => {:class => nil}) do |f| end)
+    with_concat_form_for(:user, :html => {:class => nil})
     assert_no_select 'form.user'
   end
 
   test 'SimpleForm should add custom class to form if css_class is specified' do
-    concat(simple_form_for(:user, :html => {:class => 'my_class'}) do |f| end)
+    with_concat_form_for(:user, :html => {:class => 'my_class'})
     assert_select 'form.my_class'
   end
 
   test 'pass options to SimpleForm' do
-    concat(simple_form_for(:user, :url => '/account', :html => { :id => 'my_form' }) do |f| end)
+    with_concat_form_for(:user, :url => '/account', :html => { :id => 'my_form' })
     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|
+    with_concat_form_for(:user) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
-    end)
+    end
   end
 
   test 'fields for with a hash like model yeilds an instance of FormBuilder' do
-    @hash_backed_author = HashBackedAuthor.new
-
-    concat(simple_fields_for(:author, @hash_backed_author) do |f|
+    with_concat_fields_for(:author, HashBackedAuthor.new) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
       f.input :name
-    end)
+    end
 
     assert_select "input[name='author[name]'][value='hash backed author']"
   end
+
+  test 'custom error proc is not destructive' do
+    swap_field_error_proc do
+      result = nil
+      simple_form_for :user do |f|
+        result = simple_fields_for 'address' do
+          'hello'
+        end
+      end
+
+      assert_equal 'hello', result
+    end
+  end
+
+  test 'custom error proc survives an exception' do
+    swap_field_error_proc do
+      begin
+        simple_form_for :user do |f|
+          simple_fields_for 'address' do
+            raise 'an exception'
+          end
+        end
+      rescue StandardError
+      end
+    end
+  end
+
+  private
+
+  def swap_field_error_proc(expected_error_proc = lambda {})
+    swap ActionView::Base, :field_error_proc => expected_error_proc do
+      yield
+
+      assert_equal expected_error_proc, ActionView::Base.field_error_proc
+    end
+  end
 end

data/test/components/label_test.rb

@@ -38,7 +38,7 @@ class IsolatedLabelTest < ActionView::TestCase
     @controller.action_name = "new"
     store_translations(:en, :simple_form => { :labels => { :user => {
       :new => { :description => 'Nova descrição' }
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
     end
@@ -48,7 +48,7 @@ class IsolatedLabelTest < ActionView::TestCase
     @controller.action_name = "create"
     store_translations(:en, :simple_form => { :labels => { :user => {
       :new => { :description => 'Nova descrição' }
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
     end
@@ -66,43 +66,53 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should use i18n based on model and attribute to lookup translation' do
     store_translations(:en, :simple_form => { :labels => { :user => {
       :description => 'Descrição'
-    } } } ) do
+    } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Descrição/
     end
   end
 
-  test 'input should use i18n under defaults to lookup translation' do
-    store_translations(:en, :simple_form => { :labels => { :defaults => {:age => 'Idade'} } } ) do
+  test 'label should use i18n under defaults to lookup translation' do
+    store_translations(:en, :simple_form => { :labels => { :defaults => { :age => 'Idade' } } }) do
       with_label_for @user, :age, :integer
       assert_select 'label[for=user_age]', /Idade/
     end
   end
 
-  test 'input should not use i18n label if translate is false' do
+  test 'label should not use i18n label if translate is false' do
     swap SimpleForm, :translate_labels => false do
-      store_translations(:en, :simple_form => { :labels => { :defaults => {:age => 'Idade'} } } ) do
+      store_translations(:en, :simple_form => { :labels => { :defaults => { :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
+  test 'label uses i18n with lookup for association name' do
     store_translations(:en, :simple_form => { :labels => {
       :user => { :company => 'My company!' }
-    } } ) do
+    } }) do
       with_label_for @user, :company_id, :string, :setup_association => true
       assert_select 'label[for=user_company_id]', /My company!/
     end
   end
 
+  test 'label uses i18n under defaults namespace to lookup for association name' do
+    store_translations(:en, :simple_form => { :labels => {
+      :defaults => { :company => 'Plataformatec' }
+    } }) do
+      with_label_for @user, :company, :string, :setup_association => true
+
+      assert_select 'form label', /Plataformatec/
+    end
+  end
+
   test 'label should do correct i18n lookup for nested models with nested translation' do
     @user.company = Company.new(1, 'Empresa')
 
     store_translations(:en, :simple_form => { :labels => {
       :user => { :name => 'Usuario', :company => { :name => 'Nome da empresa' } }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:company) do |company_form|
@@ -121,7 +131,7 @@ class IsolatedLabelTest < ActionView::TestCase
     store_translations(:en, :simple_form => { :labels => {
       :user    => { :name => 'Usuario' },
       :company => { :name => 'Nome da empresa' }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:company) do |company_form|
@@ -140,7 +150,7 @@ class IsolatedLabelTest < ActionView::TestCase
     store_translations(:en, :simple_form => { :labels => {
       :user => { :name => 'Usuario' },
       :tags => { :name => 'Nome da empresa' }
-    } } ) do
+    } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
         concat(f.simple_fields_for(:tags, :child_index => "new_index") do |tags_form|
@@ -181,6 +191,13 @@ class IsolatedLabelTest < ActionView::TestCase
     end
   end
 
+  test 'label should not generate empty css class' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+      with_label_for @user, :name, :string
+      assert_no_select 'label[class]'
+    end
+  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'
@@ -225,21 +242,21 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should use i18n to find required text' do
-    store_translations(:en, :simple_form => { :required => { :text => 'campo requerido' }}) do
+    store_translations(:en, :simple_form => { :required => { :text => 'campo requerido' } }) do
       with_label_for @user, :name, :string
       assert_select 'form label abbr[title=campo requerido]', '*'
     end
   end
 
   test 'label should use i18n to find required mark' do
-    store_translations(:en, :simple_form => { :required => { :mark => '*-*' }}) do
+    store_translations(:en, :simple_form => { :required => { :mark => '*-*' } }) do
       with_label_for @user, :name, :string
       assert_select 'form label abbr', '*-*'
     end
   end
 
   test 'label should use i18n to find required string tag' do
-    store_translations(:en, :simple_form => { :required => { :html => '<span class="required" title="requerido">*</span>' }}) do
+    store_translations(:en, :simple_form => { :required => { :html => '<span class="required" title="requerido">*</span>' } }) do
       with_label_for @user, :name, :string
       assert_no_select 'form label abbr'
       assert_select 'form label span.required[title=requerido]', '*'
@@ -257,7 +274,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should allow overwriting of for attribute with input_html not containing id' do
-    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => {:class => 'foo'}
+    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }, :input_html => { :class => 'foo' }
     assert_select 'label[for=my_new_id]'
   end
 
@@ -279,7 +296,7 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should use i18n properly when object is not present' do
     store_translations(:en, :simple_form => { :labels => {
       :project => { :name => 'Nome' }
-    } } ) do
+    } }) do
       with_label_for :project, :name, :string
       assert_select 'label[for=project_name]', /Nome/
     end

data/test/form_builder/association_test.rb

@@ -41,8 +41,9 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder preloads collection association' do
-    value = @user.tags
+    value = @user.tags = Object.new
     value.expects(:to_a).returns(value)
+
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
     assert_select 'form select option[value=1]', 'Tag 1'
@@ -51,19 +52,21 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder does not preload collection association if preload is false' do
-    value = @user.company
+    value = @user.tags = Object.new
     value.expects(:to_a).never
-    with_association_for @user, :company, :preload => false
-    assert_select 'form select.select#user_company_id'
-    assert_select 'form select option[value=1]', 'Company 1'
-    assert_select 'form select option[value=2]', 'Company 2'
-    assert_select 'form select option[value=3]', 'Company 3'
+
+    with_association_for @user, :tags, :preload => false
+    assert_select 'form select.select#user_tag_ids'
+    assert_select 'form select option[value=1]', 'Tag 1'
+    assert_select 'form select option[value=2]', 'Tag 2'
+    assert_select 'form select option[value=3]', 'Tag 3'
   end
 
   test 'builder does not preload non-collection association' do
-    value = @user.company
+    value = @user.company = Object.new
     value.expects(:to_a).never
-    with_association_for @user, :company, :preload => false
+
+    with_association_for @user, :company
     assert_select 'form select.select#user_company_id'
     assert_select 'form select option[value=1]', 'Company 1'
     assert_select 'form select option[value=2]', 'Company 2'
@@ -79,6 +82,12 @@ class AssociationTest < ActionView::TestCase
     assert_select 'form select option[value=3]', 'Company 3'
   end
 
+  test 'builder creates blank select if collection is nil' do
+    with_association_for @user, :company, :collection => nil
+    assert_select 'form select.select#user_company_id'
+    assert_no_select 'form select option[value=1]', 'Company 1'
+  end
+
   test 'builder allows collection radio for belongs_to associations' do
     with_association_for @user, :company, :as => :radio_buttons
     assert_select 'form input.radio_buttons#user_company_id_1'
@@ -114,7 +123,7 @@ class AssociationTest < ActionView::TestCase
 
   # ASSOCIATIONS - has_*
   test 'builder does not allow has_one associations' do
-    assert_raise RuntimeError do
+    assert_raise ArgumentError do
       with_association_for @user, :first_company, :as => :radio_buttons
     end
   end

data/test/form_builder/error_notification_test.rb

@@ -23,7 +23,7 @@ class ErrorNotificationTest < ActionView::TestCase
 
   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:'
+    assert_select 'p.error_notification', 'Please review the problems below:'
   end
 
   test 'error notification uses I18n based on model to generate the notification message' do

data/test/form_builder/general_test.rb

@@ -46,6 +46,15 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should allow to add additional classes only for wrapper' do
+    swap SimpleForm, :generate_additional_classes_for => [:wrapper] do
+      with_form_for @user, :post_count
+      assert_no_select "form input#user_post_count.string"
+      assert_no_select "form label#user_post_count.string"
+      assert_select "form div.input.string"
+    end
+  end
+
   test 'builder should allow adding custom input mappings for integer input types' do
     swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version
@@ -202,6 +211,22 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#my_input.my_input.string'
   end
 
+  test 'builder should not propagate input options to wrapper with custom wrapper' do
+    swap_wrapper :default, self.custom_wrapper_with_wrapped_input do
+      with_form_for @user, :name, :input_html => { :class => 'my_input' }
+      assert_no_select 'form div.input.my_input'
+      assert_select 'form input.my_input.string'
+    end
+  end
+
+  test 'builder should not propagate label options to wrapper with custom wrapper' do
+    swap_wrapper :default, self.custom_wrapper_with_wrapped_label do
+      with_form_for @user, :name, :label_html => { :class => 'my_label' }
+      assert_no_select 'form div.label.my_label'
+      assert_select 'form label.my_label.string'
+    end
+  end
+
   test 'builder should generate a input with label' do
     with_form_for @user, :name
     assert_select 'form label.string[for=user_name]', /Name/
@@ -212,6 +237,11 @@ class FormBuilderTest < ActionView::TestCase
     assert_no_select 'form label'
   end
 
+  test 'builder should be able to disable the label for an input and return a html safe string' do
+    with_form_for @user, :name, :label => false, :wrapper => custom_wrapper_with_wrapped_label_input
+    assert_select 'form input#user_name'
+  end
+
   test 'builder should use custom label' do
     with_form_for @user, :name, :label => 'Yay!'
     assert_select 'form label', /Yay!/
@@ -234,6 +264,8 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should be able to disable a hint even if it exists in i18n' do
     store_translations(:en, :simple_form => { :hints => { :name => 'Hint test' } }) do
+      SimpleForm::Inputs::Base.any_instance.expects(:hint).never
+
       with_form_for @user, :name, :hint => false
       assert_no_select 'span.hint'
     end
@@ -274,35 +306,65 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # DEFAULT OPTIONS
-  test 'builder should receive a default argument and pass it to the inputs' do
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      f.input :name
+  [:input, :input_field].each do |method|
+    test "builder should receive a default argument and pass it to the inputs when calling '#{method}'" do
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+        f.send(method, :name)
+      end
+      assert_select 'input.default_class'
+    end
+
+    test "builder should receive a default argument and pass it to the inputs without changing the defaults when calling '#{method}'" do
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
+        concat(f.send(method, :name))
+        concat(f.send(method, :credit_limit))
+      end
+
+      assert_select "input.string.default_class[name='user[name]']"
+      assert_no_select "input.string[name='user[credit_limit]']"
+    end
+
+    test "builder should receive a default argument and pass it to the inputs and nested form when calling '#{method}'" do
+      @user.company = Company.new(1, 'Empresa')
+
+      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+        concat(f.send(method, :name))
+        concat(f.simple_fields_for(:company) do |company_form|
+          concat(company_form.send(method, :name))
+        end)
+      end
+
+      assert_select "input.string.default_class[name='user[name]']"
+      assert_select "input.string.default_class[name='user[company_attributes][name]']"
     end
-    assert_select 'input.default_class'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs, respecting the specific options' do
+  test "builder should receive a default argument and pass it to the inputs when calling 'input', respecting the specific options" do
     with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
       f.input :name, :input_html => { :id => 'specific_id' }
     end
     assert_select 'input.default_class#specific_id'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs, overwriting the defaults with specific options' do
+  test "builder should receive a default argument and pass it to the inputs when calling 'input_field', respecting the specific options" do
+    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+      f.input_field :name, :id => 'specific_id'
+    end
+    assert_select 'input.default_class#specific_id'
+  end
+
+  test "builder should receive a default argument and pass it to the inputs when calling 'input', overwriting the defaults with specific options" do
     with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
       f.input :name, :input_html => { :id => 'specific_id' }
     end
     assert_select 'input.default_class#specific_id'
   end
 
-  test 'builder should receive a default argument and pass it to the inputs without changing the defaults' do
+  test "builder should receive a default argument and pass it to the inputs when calling 'input_field', overwriting the defaults with specific options" do
     with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      concat(f.input :name)
-      concat(f.input :credit_limit)
+      f.input_field :name, :id => 'specific_id'
     end
-
-    assert_select "input.string.default_class[name='user[name]']"
-    assert_no_select "input.string[name='user[credit_limit]']"
+    assert_select 'input.default_class#specific_id'
   end
 
   # WITHOUT OBJECT

data/test/form_builder/hint_test.rb

@@ -42,6 +42,11 @@ class HintTest < ActionView::TestCase
     assert_select 'span#hint.hint.yay'
   end
 
+  test 'hint should be output as html_safe' do
+    with_hint_for @user, :name, :hint => '<b>Bold</b> and not...'
+    assert_select 'span.hint', 'Bold and not...'
+  end
+
   # Without attribute name
 
   test 'hint without attribute name' do
@@ -105,6 +110,16 @@ class HintTest < ActionView::TestCase
     end
   end
 
+  test 'hint should output translations as html_safe' do
+    store_translations(:en, :simple_form => { :hints => { :user => {
+      :edit => { :name => '<b>This is bold</b> and this is not...' }
+    } } }) do
+      with_hint_for @user, :name
+      assert_select 'span.hint', 'This is bold and this is not...'
+    end
+  end
+
+
   # No object
 
   test 'hint should generate properly when object is not present' do

data/test/form_builder/input_field_test.rb

@@ -50,6 +50,51 @@ class InputFieldTest < ActionView::TestCase
     assert_no_select 'input.integer[as]'
   end
 
+  test 'builder input_field should use i18n to translate placeholder text' do
+    store_translations(:en, :simple_form => { :placeholders => { :user => {
+      :name => 'Name goes here'
+    } } }) do
+
+      with_concat_form_for(@user) do |f|
+        f.input_field :name
+      end
+
+      assert_select 'input.string[placeholder=Name goes here]'
+    end
+  end
+
+  test 'builder input_field should use min_max component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :age, :as => :integer
+    end
+
+    assert_select 'input[min=18]'
+  end
+
+  test 'builder input_field should use pattern component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :country, :as => :string
+    end
+
+    assert_select 'input[pattern="\w+"]'
+  end
+
+  test 'builder input_field should use readonly component' do
+    with_concat_form_for(@other_validating_user) do |f|
+      f.input_field :age, :as => :integer, :readonly => true
+    end
+
+    assert_select 'input.integer.readonly[readonly]'
+  end
+
+  test 'builder input_field should use maxlength component' do
+    with_concat_form_for(@validating_user) do |f|
+      f.input_field :name, :as => :string
+    end
+
+    assert_select 'input.string[maxlength=25]'
+  end
+
   test 'builder collection input_field should generate input tag with a clean HTML' do
     with_concat_form_for(@user) do |f|
       f.input_field :status, :collection => ['Open', 'Closed'], :class => 'status', :label_method => :to_s, :value_method => :to_s

data/test/form_builder/label_test.rb

@@ -13,6 +13,12 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string[for=user_name]', /Name/
   end
 
+  test 'builder should generate a label for the boolean attrbiute' do
+    with_label_for @user, :name, :as => :boolean
+    assert_select 'label.boolean[for=user_name]', /Name/
+    assert_no_select 'label[as=boolean]'
+  end
+
   test 'builder should generate a label componet tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'