simple_form 2.1.3 → 3.0.0.beta1

data/test/action_view_extensions/form_helper_test.rb

@@ -19,31 +19,31 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'SimpleForm should not use default browser validations if specified in the configuration options' do
-    swap SimpleForm, :browser_validations => false do
+    swap SimpleForm, browser_validations: false do
       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
-    with_concat_form_for(:user, :html => { :novalidate => true })
+  test 'disabled browser validations overrides default configuration' do
+    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
-      with_concat_form_for(:user, :html => { :novalidate => false })
+  test 'enabled browser validations overrides disabled configuration' do
+    swap SimpleForm, browser_validations: false do
+      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
-    with_concat_form_for(:user, :html => { :novalidate => true })
+    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
-    with_concat_form_for(:user, :as => 'superuser')
+    with_concat_form_for(:user, as: 'superuser')
     assert_select 'form.simple_form.superuser'
   end
 
@@ -55,7 +55,7 @@ class FormHelperTest < ActionView::TestCase
 
   test 'SimpleForm should add :as option with new prefix as css class to form if record is not persisted' do
     @user.new_record!
-    with_concat_form_for(@user, :as => 'superuser')
+    with_concat_form_for(@user, as: 'superuser')
     assert_select 'form.simple_form.new_superuser'
   end
 
@@ -65,7 +65,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'SimpleForm should add :as options with edit prefix as css class to form if record is persisted' do
-    with_concat_form_for(@user, :as => 'superuser')
+    with_concat_form_for(@user, as: 'superuser')
     assert_select 'form.simple_form.edit_superuser'
   end
 
@@ -75,28 +75,28 @@ class FormHelperTest < ActionView::TestCase
   end
 
   test 'SimpleForm should not add object class to form if css_class is specified' do
-    with_concat_form_for(:user, :html => {:class => nil})
+    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
-    with_concat_form_for(:user, :html => {:class => 'my_class'})
+    with_concat_form_for(:user, html: { class: 'my_class' })
     assert_select 'form.my_class'
   end
 
   test 'pass options to SimpleForm' do
-    with_concat_form_for(:user, :url => '/account', :html => { :id => 'my_form' })
+    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
+  test 'form_for yields an instance of FormBuilder' do
     with_concat_form_for(:user) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
     end
   end
 
-  test 'fields for with a hash like model yeilds an instance of FormBuilder' do
+  test 'fields_for with a hash like model yields an instance of FormBuilder' do
     with_concat_fields_for(:author, HashBackedAuthor.new) do |f|
       assert f.instance_of?(SimpleForm::FormBuilder)
       f.input :name
@@ -134,7 +134,7 @@ class FormHelperTest < ActionView::TestCase
   private
 
   def swap_field_error_proc(expected_error_proc = lambda {})
-    swap ActionView::Base, :field_error_proc => expected_error_proc do
+    swap ActionView::Base, field_error_proc: expected_error_proc do
       yield
 
       assert_equal expected_error_proc, ActionView::Base.field_error_proc

data/test/components/label_test.rb

@@ -20,7 +20,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should allow a customized description' do
-    with_label_for @user, :name, :string, :label => 'My label!'
+    with_label_for @user, :name, :string, label: 'My label!'
     assert_select 'label[for=user_name]', /My label!/
   end
 
@@ -30,14 +30,14 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should use human attribute name based on association name' do
-    with_label_for @user, :company_id, :string, :setup_association => true
+    with_label_for @user, :company_id, :string, setup_association: true
     assert_select 'label', /Company Human Name!/
   end
 
   test 'label should use i18n based on model, action, and attribute to lookup translation' do
     @controller.action_name = "new"
-    store_translations(:en, :simple_form => { :labels => { :user => {
-      :new => { :description => 'Nova descrição' }
+    store_translations(:en, simple_form: { labels: { user: {
+      new: { description: 'Nova descrição' }
     } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
@@ -46,8 +46,8 @@ class IsolatedLabelTest < ActionView::TestCase
 
   test 'label should fallback to new when action is create' do
     @controller.action_name = "create"
-    store_translations(:en, :simple_form => { :labels => { :user => {
-      :new => { :description => 'Nova descrição' }
+    store_translations(:en, simple_form: { labels: { user: {
+      new: { description: 'Nova descrição' }
     } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Nova descrição/
@@ -64,8 +64,8 @@ class IsolatedLabelTest < ActionView::TestCase
   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'
+    store_translations(:en, simple_form: { labels: { user: {
+      description: 'Descrição'
     } } }) do
       with_label_for @user, :description, :text
       assert_select 'label[for=user_description]', /Descrição/
@@ -73,15 +73,15 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should use i18n under defaults to lookup translation' 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]', /Idade/
     end
   end
 
   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
+    swap SimpleForm, translate_labels: false 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
@@ -89,19 +89,19 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label uses i18n with lookup for association name' do
-    store_translations(:en, :simple_form => { :labels => {
-      :user => { :company => 'My company!' }
+    store_translations(:en, simple_form: { labels: {
+      user: { company: 'My company!' }
     } }) do
-      with_label_for @user, :company_id, :string, :setup_association => true
+      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' }
+    store_translations(:en, simple_form: { labels: {
+      defaults: { company: 'Plataformatec' }
     } }) do
-      with_label_for @user, :company, :string, :setup_association => true
+      with_label_for @user, :company, :string, setup_association: true
 
       assert_select 'form label', /Plataformatec/
     end
@@ -110,8 +110,8 @@ class IsolatedLabelTest < ActionView::TestCase
   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' } }
+    store_translations(:en, simple_form: { labels: {
+      user: { name: 'Usuario', company: { name: 'Nome da empresa' } }
     } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
@@ -128,9 +128,9 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should do correct i18n lookup for nested models with no nested translation' do
     @user.company = Company.new(1, 'Empresa')
 
-    store_translations(:en, :simple_form => { :labels => {
-      :user    => { :name => 'Usuario' },
-      :company => { :name => 'Nome da empresa' }
+    store_translations(:en, simple_form: { labels: {
+      user: { name: 'Usuario' },
+      company: { name: 'Nome da empresa' }
     } }) do
       with_concat_form_for @user do |f|
         concat f.input :name
@@ -147,13 +147,13 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should do correct i18n lookup for nested has_many models with no nested translation' do
     @user.tags = [Tag.new(1, 'Empresa')]
 
-    store_translations(:en, :simple_form => { :labels => {
-      :user => { :name => 'Usuario' },
-      :tags => { :name => 'Nome da empresa' }
+    store_translations(:en, simple_form: { labels: {
+      user: { name: 'Usuario' },
+      tags: { name: 'Nome da empresa' }
     } }) 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|
+        concat(f.simple_fields_for(:tags, child_index: "new_index") do |tags_form|
           concat(tags_form.input :name)
         end)
       end
@@ -177,7 +177,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should not have css class from type when generate_additional_classes_for does not include :label' do
-    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
       with_label_for @user, :name, :string
       assert_no_select 'label.string'
       with_label_for @user, :description, :text
@@ -192,7 +192,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should not generate empty css class' do
-    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
       with_label_for @user, :name, :string
       assert_no_select 'label[class]'
     end
@@ -206,7 +206,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should not obtain required from ActiveModel::Validations when generate_additional_classes_for does not include :label' do
-    swap SimpleForm, :generate_additional_classes_for => [:wrapper, :input] do
+    swap SimpleForm, generate_additional_classes_for: [:wrapper, :input] do
       with_label_for @validating_user, :name, :string
       assert_no_select 'label.required'
       with_label_for @validating_user, :status, :string
@@ -215,9 +215,9 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should allow overriding required when ActiveModel::Validations is included' do
-    with_label_for @validating_user, :name, :string, :required => false
+    with_label_for @validating_user, :name, :string, required: false
     assert_select 'label.optional'
-    with_label_for @validating_user, :status, :string, :required => true
+    with_label_for @validating_user, :status, :string, required: true
     assert_select 'label.required'
   end
 
@@ -227,7 +227,7 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should be able to disable required when ActiveModel::Validations is not included' do
-    with_label_for @user, :name, :string, :required => false
+    with_label_for @user, :name, :string, required: false
     assert_no_select 'label.required'
   end
 
@@ -237,26 +237,26 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should not have required text in no required inputs' do
-    with_label_for @user, :name, :string, :required => false
+    with_label_for @user, :name, :string, required: false
     assert_no_select 'form label abbr'
   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]', '*'
@@ -264,22 +264,22 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should allow overwriting input id' do
-    with_label_for @user, :name, :string, :input_html => { :id => 'my_new_id' }
+    with_label_for @user, :name, :string, input_html: { id: 'my_new_id' }
     assert_select 'label[for=my_new_id]'
   end
 
   test 'label should allow overwriting of for attribute' do
-    with_label_for @user, :name, :string, :label_html => { :for => 'my_new_id' }
+    with_label_for @user, :name, :string, label_html: { for: 'my_new_id' }
     assert_select 'label[for=my_new_id]'
   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
 
   test 'label should use default input id when it was not overridden' do
-    with_label_for @user, :name, :string, :input_html => { :class => 'my_new_id' }
+    with_label_for @user, :name, :string, input_html: { class: 'my_new_id' }
     assert_select 'label[for=user_name]'
   end
 
@@ -289,13 +289,13 @@ class IsolatedLabelTest < ActionView::TestCase
   end
 
   test 'label should include for attribute for select collection' do
-    with_label_for @user, :sex, :select, :collection => [:male, :female]
+    with_label_for @user, :sex, :select, collection: [:male, :female]
     assert_select 'label[for=user_sex]'
   end
 
   test 'label should use i18n properly when object is not present' do
-    store_translations(:en, :simple_form => { :labels => {
-      :project => { :name => 'Nome' }
+    store_translations(:en, simple_form: { labels: {
+      project: { name: 'Nome' }
     } }) do
       with_label_for :project, :name, :string
       assert_select 'label[for=project_name]', /Nome/
@@ -305,19 +305,19 @@ class IsolatedLabelTest < ActionView::TestCase
   test 'label should add required by default when object is not present' do
     with_label_for :project, :name, :string
     assert_select 'label.required[for=project_name]'
-    with_label_for :project, :description, :string, :required => false
+    with_label_for :project, :description, :string, required: false
     assert_no_select 'label.required[for=project_description]'
   end
 
   test 'label should add chosen label class' do
-    swap SimpleForm, :label_class => :my_custom_class do
+    swap SimpleForm, label_class: :my_custom_class do
       with_label_for @user, :name, :string
       assert_select 'label.my_custom_class'
     end
   end
 
   test 'label strips extra classes even when label_class is nil' do
-    swap SimpleForm, :label_class => nil do
+    swap SimpleForm, label_class: nil do
       with_label_for @user, :name, :string
       assert_select "label[class='string required']"
       assert_no_select "label[class='string required ']"

data/test/form_builder/association_test.rb

@@ -25,7 +25,7 @@ class AssociationTest < ActionView::TestCase
   test 'builder association forwards collection to simple_fields_for' do
     calls = 0
     simple_form_for @user do |f|
-      f.association :company, :collection => Company.all do |c|
+      f.association :company, collection: Company.all do |c|
         calls += 1
       end
     end
@@ -34,8 +34,8 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder association marks input as required based on both association and attribute' do
-    swap SimpleForm, :required_by_default => false do
-      with_association_for @validating_user, :company, :collection => []
+    swap SimpleForm, required_by_default: false do
+      with_association_for @validating_user, :company, collection: []
       assert_select 'label.required'
     end
   end
@@ -55,7 +55,7 @@ class AssociationTest < ActionView::TestCase
     value = @user.tags = Object.new
     value.expects(:to_a).never
 
-    with_association_for @user, :tags, :preload => false
+    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'
@@ -83,13 +83,13 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder creates blank select if collection is nil' do
-    with_association_for @user, :company, :collection => nil
+    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
+    with_association_for @user, :company, as: :radio_buttons
     assert_select 'form input.radio_buttons#user_company_id_1'
     assert_select 'form input.radio_buttons#user_company_id_2'
     assert_select 'form input.radio_buttons#user_company_id_3'
@@ -97,7 +97,7 @@ class AssociationTest < ActionView::TestCase
 
   test 'builder marks the record which already belongs to the user' do
     @user.company_id = 2
-    with_association_for @user, :company, :as => :radio_buttons
+    with_association_for @user, :company, as: :radio_buttons
     assert_no_select 'form input.radio_buttons#user_company_id_1[checked=checked]'
     assert_select 'form input.radio_buttons#user_company_id_2[checked=checked]'
     assert_no_select 'form input.radio_buttons#user_company_id_3[checked=checked]'
@@ -113,32 +113,32 @@ class AssociationTest < ActionView::TestCase
   end
 
   test 'builder should allow overriding collection to association input' do
-    with_association_for @user, :company, :include_blank => false,
-                         :collection => [Company.new(999, 'Teste')]
+    with_association_for @user, :company, include_blank: false,
+                         collection: [Company.new(999, 'Teste')]
     assert_select 'form select.select#user_company_id'
     assert_no_select 'form select option[value=1]'
     assert_select 'form select option[value=999]', 'Teste'
-    assert_select 'form select option', :count => 1
+    assert_select 'form select option', count: 1
   end
 
   # ASSOCIATIONS - has_*
   test 'builder does not allow has_one associations' do
     assert_raise ArgumentError do
-      with_association_for @user, :first_company, :as => :radio_buttons
+      with_association_for @user, :first_company, as: :radio_buttons
     end
   end
 
   test 'builder creates a select with multiple options for collection associations' do
     with_association_for @user, :tags
     assert_select 'form select.select#user_tag_ids'
-    assert_select 'form select[multiple=multiple][size=5]'
+    assert_select 'form select[multiple=multiple]'
     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 allows size to be overwritten for collection associations' do
-    with_association_for @user, :tags, :input_html => { :size => 10 }
+    with_association_for @user, :tags, input_html: { size: 10 }
     assert_select 'form select[multiple=multiple][size=10]'
   end
 
@@ -152,7 +152,7 @@ class AssociationTest < ActionView::TestCase
 
   test 'builder allows a collection of check boxes for collection associations' do
     @user.tag_ids = [1, 2]
-    with_association_for @user, :tags, :as => :check_boxes
+    with_association_for @user, :tags, as: :check_boxes
     assert_select 'form input#user_tag_ids_1[type=checkbox]'
     assert_select 'form input#user_tag_ids_2[type=checkbox]'
     assert_select 'form input#user_tag_ids_3[type=checkbox]'
@@ -160,27 +160,27 @@ class AssociationTest < ActionView::TestCase
 
   test 'builder marks all selected records for collection boxes' do
     @user.tag_ids = [1, 2]
-    with_association_for @user, :tags, :as => :check_boxes
+    with_association_for @user, :tags, as: :check_boxes
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
     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
+    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
+    assert_select 'form ul', count: 1
+    assert_select 'form ul li', count: 3
   end
 
   test 'builder with collection support should not change the options hash' do
-    options = { :as => :check_boxes, :collection_wrapper_tag => :ul, :item_wrapper_tag => :li}
+    options = { as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li}
     with_association_for @user, :tags, options
 
-    assert_select 'form ul', :count => 1
-    assert_select 'form ul li', :count => 3
-    assert_equal({ :as => :check_boxes, :collection_wrapper_tag => :ul, :item_wrapper_tag => :li},
+    assert_select 'form ul', count: 1
+    assert_select 'form ul li', count: 3
+    assert_equal({ as: :check_boxes, collection_wrapper_tag: :ul, item_wrapper_tag: :li},
                  options)
   end
 end