simple_form 3.0.1 → 3.1.1

data/test/form_builder/general_test.rb

@@ -8,7 +8,7 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'nested simple fields should yield an instance of FormBuilder' do
+  test 'nested simple fields yields an instance of FormBuilder' do
     simple_form_for :user do |f|
       f.simple_fields_for :posts do |posts_form|
         assert posts_form.instance_of?(SimpleForm::FormBuilder)
@@ -22,7 +22,7 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder should work without controller' do
+  test 'builder works without controller' do
     stub_any_instance ActionView::TestCase, :controller, nil do
       simple_form_for @user do |f|
         assert f.input(:name)
@@ -30,7 +30,7 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder input should allow a block to configure input' do
+  test 'builder input allows a block to configure input' do
     with_form_for @user, :name do
       text_field_tag :foo, :bar, id: :cool
     end
@@ -38,7 +38,7 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'input#cool'
   end
 
-  test 'builder should allow adding custom input mappings for default input types' do
+  test 'builder allows 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'
@@ -46,7 +46,18 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder should allow to skip input_type class' do
+  test 'builder does not override custom input mappings for custom collection' do
+    swap SimpleForm, input_mappings: { /gender$/ => :check_boxes } do
+      with_concat_form_for @user do |f|
+        f.input :gender, collection: [:male, :female]
+      end
+
+      assert_no_select 'select option', 'Male'
+      assert_select 'input[type=checkbox][value=male]'
+    end
+  end
+
+  test 'builder allows to skip input_type class' do
     swap SimpleForm, generate_additional_classes_for: [:label, :wrapper] do
       with_form_for @user, :post_count
       assert_no_select "form input#user_post_count.integer"
@@ -54,7 +65,7 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder should allow to add additional classes only for wrapper' do
+  test 'builder allows 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"
@@ -63,7 +74,7 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder should allow adding custom input mappings for integer input types' do
+  test 'builder allows adding custom input mappings for integer input types' do
     swap SimpleForm, input_mappings: { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version
       assert_no_select 'form input#user_lock_version.integer'
@@ -101,82 +112,87 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # INPUT TYPES
-  test 'builder should generate text fields for string columns' do
+  test 'builder generates text fields for string columns' do
     with_form_for @user, :name
     assert_select 'form input#user_name.string'
   end
 
-  test 'builder should generate text areas for text columns' do
+  test 'builder generates text areas for text columns' do
     with_form_for @user, :description
     assert_select 'form textarea#user_description.text'
   end
 
-  test 'builder should generate a checkbox for boolean columns' do
+  test 'builder generates a checkbox for boolean columns' do
     with_form_for @user, :active
     assert_select 'form input[type=checkbox]#user_active.boolean'
   end
 
-  test 'builder should use integer text field for integer columns' do
+  test 'builder uses integer text field for integer columns' do
     with_form_for @user, :age
     assert_select 'form input#user_age.numeric.integer'
   end
 
-  test 'builder should generate decimal text field for decimal columns' do
+  test 'builder generates decimal text field for decimal columns' do
     with_form_for @user, :credit_limit
     assert_select 'form input#user_credit_limit.numeric.decimal'
   end
 
-  test 'builder should generate password fields for columns that matches password' do
+  test 'builder generates uuid fields for uuid columns' do
+    with_form_for @user, :uuid
+    assert_select 'form input#user_uuid.string.uuid'
+  end
+
+  test 'builder generates password fields for columns that matches password' do
     with_form_for @user, :password
     assert_select 'form input#user_password.password'
   end
 
-  test 'builder should generate country fields for columns that matches country' do
+  test 'builder generates country fields for columns that matches country' do
     with_form_for @user, :residence_country
     assert_select 'form select#user_residence_country.country'
   end
 
-  test 'builder should generate time_zone fields for columns that matches time_zone' do
+  test 'builder generates time_zone fields for columns that matches time_zone' do
     with_form_for @user, :time_zone
     assert_select 'form select#user_time_zone.time_zone'
   end
 
-  test 'builder should generate email fields for columns that matches email' do
+  test 'builder generates email fields for columns that matches email' do
     with_form_for @user, :email
     assert_select 'form input#user_email.string.email'
   end
 
-  test 'builder should generate tel fields for columns that matches phone' do
+  test 'builder generates 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
+  test 'builder generates url fields for columns that matches url' do
     with_form_for @user, :url
     assert_select 'form input#user_url.string.url'
   end
 
-  test 'builder should generate date select for date columns' do
+  test 'builder generates date select for date columns' do
     with_form_for @user, :born_at
     assert_select 'form select#user_born_at_1i.date'
   end
 
-  test 'builder should generate time select for time columns' do
+  test 'builder generates time select for time columns' do
     with_form_for @user, :delivery_time
     assert_select 'form select#user_delivery_time_4i.time'
   end
 
-  test 'builder should generate datetime select for datetime columns' do
+  test 'builder generates datetime select for datetime columns' do
     with_form_for @user, :created_at
     assert_select 'form select#user_created_at_1i.datetime'
   end
 
-  test 'builder should generate datetime select for timestamp columns' do
+  test 'builder generates datetime select for timestamp columns' do
     with_form_for @user, :updated_at
     assert_select 'form select#user_updated_at_1i.datetime'
   end
 
-  test 'builder should generate file for file columns' do
+  test 'builder generates file for file columns' do
     @user.avatar = MiniTest::Mock.new
     @user.avatar.expect(:public_filename, true)
 
@@ -184,7 +200,7 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_avatar.file'
   end
 
-  test 'builder should generate file for attributes that are real db columns but have file methods' do
+  test 'builder generates file for attributes that are real db columns but have file methods' do
     @user.home_picture = MiniTest::Mock.new
     @user.home_picture.expect(:mounted_as, true)
 
@@ -192,12 +208,12 @@ class FormBuilderTest < ActionView::TestCase
     assert_select 'form input#user_home_picture.file'
   end
 
-  test 'build should generate select if a collection is given' do
+  test 'build generates select if a collection is given' do
     with_form_for @user, :age, collection: 1..60
     assert_select 'form select#user_age.select'
   end
 
-  test 'builder should allow overriding default input type for text' do
+  test 'builder allows overriding default input type for text' do
     with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'
     assert_select 'form textarea#user_name.text'
@@ -212,76 +228,96 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # COMMON OPTIONS
-  test 'builder should add chosen form class' do
-    swap SimpleForm, form_class: :my_custom_class do
+  # Remove this test when SimpleForm.form_class is removed in 4.x
+  test 'builder adds chosen form class' do
+    ActiveSupport::Deprecation.silence do
+      swap SimpleForm, form_class: :my_custom_class do
+        with_form_for @user, :name
+        assert_select 'form.my_custom_class'
+      end
+    end
+  end
+
+  # Remove this test when SimpleForm.form_class is removed in 4.x
+  test 'builder adds chosen form class and default form class' do
+    ActiveSupport::Deprecation.silence do
+      swap SimpleForm, form_class: "my_custom_class", default_form_class: "my_default_class" do
+        with_form_for @user, :name
+        assert_select 'form.my_custom_class.my_default_class'
+      end
+    end
+  end
+
+  test 'builder adds default form class' do
+    swap SimpleForm, default_form_class: "default_class" do
       with_form_for @user, :name
-      assert_select 'form.my_custom_class'
+      assert_select 'form.default_class'
     end
   end
 
-  test 'builder should allow passing options to input' do
+  test 'builder allows passing options to input' do
     with_form_for @user, :name, input_html: { class: 'my_input', id: 'my_input' }
     assert_select 'form input#my_input.my_input.string'
   end
 
-  test 'builder should not propagate input options to wrapper' do
+  test 'builder does not propagate input options to wrapper' do
     with_form_for @user, :name, input_html: { class: 'my_input', id: 'my_input' }
     assert_no_select 'form div.input.my_input.string'
     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
+  test 'builder does not propagate input options to wrapper with custom wrapper' do
+    swap_wrapper :default, 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
+  test 'builder does not propagate label options to wrapper with custom wrapper' do
+    swap_wrapper :default, 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
+  test 'builder generates an input with label' do
     with_form_for @user, :name
     assert_select 'form label.string[for=user_name]', /Name/
   end
 
-  test 'builder should be able to disable the label for a input' do
+  test 'builder is able to disable the label for an input' do
     with_form_for @user, :name, label: false
     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
+  test 'builder is 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
+  test 'builder uses custom label' do
     with_form_for @user, :name, label: 'Yay!'
     assert_select 'form label', /Yay!/
   end
 
-  test 'builder should pass options to label' do
+  test 'builder passes options to label' do
     with_form_for @user, :name, label_html: { id: "cool" }
     assert_select 'form label#cool', /Name/
   end
 
-  test 'builder should not generate hints for a input' do
+  test 'builder does not generate hints for an input' do
     with_form_for @user, :name
     assert_no_select 'span.hint'
   end
 
-  test 'builder should be able to add a hint for a input' do
+  test 'builder is able to add a hint for an input' do
     with_form_for @user, :name, hint: 'test'
     assert_select 'span.hint', 'test'
   end
 
-  test 'builder should be able to disable a hint even if it exists in i18n' do
+  test 'builder is able to disable a hint even if it exists in i18n' do
     store_translations(:en, simple_form: { hints: { name: 'Hint test' } }) do
       stub_any_instance(SimpleForm::Inputs::Base, :hint, -> { raise 'Never' }) do
         with_form_for @user, :name, hint: false
@@ -290,32 +326,32 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test 'builder should pass options to hint' do
+  test 'builder passes options to hint' do
     with_form_for @user, :name, hint: 'test', hint_html: { id: "cool" }
     assert_select 'span.hint#cool', 'test'
   end
 
-  test 'builder should generate errors for attribute without errors' do
+  test 'builder generates errors for attribute without errors' do
     with_form_for @user, :credit_limit
     assert_no_select 'span.errors'
   end
 
-  test 'builder should generate errors for attribute with errors' do
+  test 'builder generates errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can't be blank"
+    assert_select 'span.error', "cannot be blank"
   end
 
-  test 'builder should be able to disable showing errors for a input' do
+  test 'builder is able to disable showing errors for an input' do
     with_form_for @user, :name, error: false
     assert_no_select 'span.error'
   end
 
-  test 'builder should pass options to errors' do
+  test 'builder passes options to errors' do
     with_form_for @user, :name, error_html: { id: "cool" }
-    assert_select 'span.error#cool', "can't be blank"
+    assert_select 'span.error#cool', "cannot be blank"
   end
 
-  test 'placeholder should not be generated when set to false' do
+  test 'placeholder does not be generated when set to false' do
     store_translations(:en, simple_form: { placeholders: { user: {
       name: 'Name goes here'
     } } }) do
@@ -326,30 +362,30 @@ class FormBuilderTest < ActionView::TestCase
 
   # DEFAULT OPTIONS
   [:input, :input_field].each do |method|
-    test "builder should receive a default argument and pass it to the inputs when calling '#{method}'" do
+    test "builder receives 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)
+        f.public_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
+    test "builder receives 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))
+        concat(f.public_send(method, :name))
+        concat(f.public_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
+    test "builder receives 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.public_send(method, :name))
         concat(f.simple_fields_for(:company) do |company_form|
-          concat(company_form.send(method, :name))
+          concat(company_form.public_send(method, :name))
         end)
       end
 
@@ -358,28 +394,28 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
-  test "builder should receive a default argument and pass it to the inputs when calling 'input', respecting the specific options" do
+  test "builder receives 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 when calling 'input_field', respecting the specific options" do
+  test "builder receives 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
+  test "builder receives 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 when calling 'input_field', overwriting the defaults with specific options" do
+  test "builder receives 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|
       f.input_field :name, id: 'specific_id'
     end
@@ -387,24 +423,24 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # WITHOUT OBJECT
-  test 'builder should generate properly when object is not present' do
+  test 'builder generates properly when object is not present' do
     with_form_for :project, :name
     assert_select 'form input.string#project_name'
   end
 
-  test 'builder should generate password fields based on attribute name when object is not present' do
+  test 'builder generates password fields based on attribute name when object is not present' do
     with_form_for :project, :password_confirmation
     assert_select 'form input[type=password].password#project_password_confirmation'
   end
 
-  test 'builder should generate text fields by default for all attributes when object is not present' do
+  test 'builder generates text fields by default for all attributes when object is not present' do
     with_form_for :project, :created_at
     assert_select 'form input.string#project_created_at'
     with_form_for :project, :budget
     assert_select 'form input.string#project_budget'
   end
 
-  test 'builder should allow overriding input type when object is not present' do
+  test 'builder allows overriding input type when object is not present' do
     with_form_for :project, :created_at, as: :datetime
     assert_select 'form select.datetime#project_created_at_1i'
     with_form_for :project, :budget, as: :decimal
@@ -412,24 +448,24 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   # CUSTOM FORM BUILDER
-  test 'custom builder should inherit mappings' do
+  test 'custom builder inherits mappings' do
     with_custom_form_for @user, :email
     assert_select 'form input[type=email]#user_email.custom'
   end
 
-  test 'form with CustomMapTypeFormBuilder should use custom map type builder' do
+  test 'form with CustomMapTypeFormBuilder uses custom map type builder' do
     with_concat_custom_mapping_form_for(:user) do |user|
       assert user.instance_of?(CustomMapTypeFormBuilder)
     end
   end
 
-  test 'form with CustomMapTypeFormBuilder should use custom mapping' do
+  test 'form with CustomMapTypeFormBuilder uses custom mapping' do
     with_concat_custom_mapping_form_for(:user) do |user|
       assert_equal SimpleForm::Inputs::StringInput, user.class.mappings[:custom_type]
     end
   end
 
-  test 'form without CustomMapTypeFormBuilder should not use custom mapping' do
+  test 'form without CustomMapTypeFormBuilder does not use custom mapping' do
     with_concat_form_for(:user) do |user|
       assert_nil user.class.mappings[:custom_type]
     end

data/test/form_builder/hint_test.rb

@@ -8,24 +8,24 @@ class HintTest < ActionView::TestCase
     end
   end
 
-  test 'hint should not be generated by default' do
+  test 'hint does not be generated by default' do
     with_hint_for @user, :name
     assert_no_select 'span.hint'
   end
 
-  test 'hint should be generated with optional text' do
+  test 'hint is generated with optional text' do
     with_hint_for @user, :name, hint: 'Use with care...'
     assert_select 'span.hint', 'Use with care...'
   end
 
-  test 'hint should not modify the options hash' do
+  test 'hint does not modify the options hash' do
     options = { hint: 'Use with care...' }
     with_hint_for @user, :name, options
     assert_select 'span.hint', 'Use with care...'
     assert_equal({ hint: 'Use with care...' }, options)
   end
 
-  test 'hint should be generated cleanly with optional text' do
+  test 'hint is generated cleanly with optional text' do
     with_hint_for @user, :name, hint: 'Use with care...', hint_tag: :span
     assert_no_select 'span.hint[hint]'
     assert_no_select 'span.hint[hint_tag]'
@@ -37,20 +37,20 @@ class HintTest < ActionView::TestCase
     assert_select 'p.hint', 'Use with care...'
   end
 
-  test 'hint should be able to pass html options' do
+  test 'hint is able to pass html options' do
     with_hint_for @user, :name, hint: 'Yay!', id: 'hint', class: 'yay'
     assert_select 'span#hint.hint.yay'
   end
 
-  test 'hint should be output as html_safe' do
+  test 'hint is output as html_safe' do
     with_hint_for @user, :name, hint: '<b>Bold</b> and not...'.html_safe
     assert_select 'span.hint', 'Bold and not...'
     assert_select 'span.hint b', 'Bold'
   end
 
-  test 'builder should escape hint text' do
+  test 'builder escapes hint text' do
     with_hint_for @user, :name, hint: '<script>alert(1337)</script>'
-    assert_select 'span.hint', "&lt;script&gt;alert(1337)&lt;/script&gt;"
+    assert_no_select 'span.hint script'
   end
 
   # Without attribute name
@@ -60,7 +60,7 @@ class HintTest < ActionView::TestCase
     assert_select 'span.hint', 'Hello World!'
   end
 
-  test 'hint without attribute name should generate component tag with a clean HTML' do
+  test 'hint without attribute name generates component tag with a clean HTML' do
     with_hint_for @validating_user, 'Hello World!'
     assert_no_select 'span.hint[hint]'
     assert_no_select 'span.hint[hint_html]'
@@ -73,14 +73,14 @@ class HintTest < ActionView::TestCase
     assert_no_select 'p.hint[hint_tag]'
   end
 
-  test 'hint without attribute name should be able to pass html options' do
+  test 'hint without attribute name is able to pass html options' do
     with_hint_for @user, 'Yay', id: 'hint', class: 'yay'
     assert_select 'span#hint.hint.yay', 'Yay'
   end
 
   # I18n
 
-  test 'hint should use i18n based on model, action, and attribute to lookup translation' do
+  test 'hint uses i18n based on model, action, and attribute to lookup translation' do
     store_translations(:en, simple_form: { hints: { user: {
       edit: { name: 'Content of this input will be truncated...' }
     } } }) do
@@ -89,7 +89,7 @@ class HintTest < ActionView::TestCase
     end
   end
 
-  test 'hint should use i18n with model and attribute to lookup translation' do
+  test 'hint uses i18n with model and attribute to lookup translation' do
     store_translations(:en, simple_form: { hints: { user: {
       name: 'Content of this input will be capitalized...'
     } } }) do
@@ -98,7 +98,7 @@ class HintTest < ActionView::TestCase
     end
   end
 
-  test 'hint should use i18n under defaults namespace to lookup translation' do
+  test 'hint uses i18n under defaults namespace to lookup translation' do
     store_translations(:en, simple_form: {
       hints: { defaults: { name: 'Content of this input will be downcased...' } }
     }) do
@@ -107,7 +107,7 @@ class HintTest < ActionView::TestCase
     end
   end
 
-  test 'hint should use i18n with lookup for association name' do
+  test 'hint uses i18n with lookup for association name' do
     store_translations(:en, simple_form: { hints: {
       user: { company: 'My company!' }
     } } ) do
@@ -116,7 +116,7 @@ class HintTest < ActionView::TestCase
     end
   end
 
-  test 'hint should output translations as html_safe' do
+  test 'hint outputs translations as html_safe' do
     store_translations(:en, simple_form: { hints: { user: {
       edit: { name: '<b>This is bold</b> and this is not...' }
     } } }) do
@@ -128,7 +128,7 @@ class HintTest < ActionView::TestCase
 
   # No object
 
-  test 'hint should generate properly when object is not present' do
+  test 'hint generates properly when object is not present' do
     with_hint_for :project, :name, hint: 'Test without object'
     assert_select 'span.hint', 'Test without object'
   end
@@ -137,8 +137,8 @@ class HintTest < ActionView::TestCase
 
   test 'hint with custom wrappers works' do
     swap_wrapper do
-      with_hint_for @user, :name, hint: "can't be blank"
-      assert_select 'div.omg_hint', "can&#39;t be blank"
+      with_hint_for @user, :name, hint: "cannot be blank"
+      assert_select 'div.omg_hint', "cannot be blank"
     end
   end
 end