simple_form 2.1.3 → 3.0.0

data/test/form_builder/input_field_test.rb

@@ -14,36 +14,53 @@ class InputFieldTest < ActionView::TestCase
 
   test 'builder input_field should allow overriding default input type' do
     with_concat_form_for(@user) do |f|
-      f.input_field :name, :as => :text
+      f.input_field :name, as: :text
     end
 
     assert_no_select 'input#user_name'
     assert_select 'textarea#user_name.text'
   end
 
+  test 'builder input_field should generate input type based on column type' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age
+    end
+
+    assert_select 'input[type=number].integer#user_age'
+  end
+
+  test 'builder input_field should be able to disable any component' do
+    with_concat_form_for(@user) do |f|
+      f.input_field :age, html5: false
+    end
+
+    assert_no_select 'input[html5=false]#user_age'
+    assert_select 'input[type=text].integer#user_age'
+  end
+
   test 'builder input_field should allow passing options to input tag' do
     with_concat_form_for(@user) do |f|
-      f.input_field :name, :id => 'name_input', :class => 'name'
+      f.input_field :name, id: 'name_input', class: 'name'
     end
 
     assert_select 'input.string.name#name_input'
   end
 
   test 'builder input_field should not modify the options hash' do
-    options = { :id => 'name_input', :class => 'name' }
+    options = { id: 'name_input', class: 'name' }
 
     with_concat_form_for(@user) do |f|
       f.input_field :name, options
     end
 
     assert_select 'input.string.name#name_input'
-    assert_equal({ :id => 'name_input', :class => 'name' }, options)
+    assert_equal({ id: 'name_input', class: 'name' }, options)
   end
 
 
   test 'builder input_field should generate an input tag with a clean HTML' do
     with_concat_form_for(@user) do |f|
-      f.input_field :name, :as => :integer, :class => 'name'
+      f.input_field :name, as: :integer, class: 'name'
     end
 
     assert_no_select 'input.integer[input_html]'
@@ -51,8 +68,8 @@ class InputFieldTest < ActionView::TestCase
   end
 
   test 'builder input_field should use i18n to translate placeholder text' do
-    store_translations(:en, :simple_form => { :placeholders => { :user => {
-      :name => 'Name goes here'
+    store_translations(:en, simple_form: { placeholders: { user: {
+      name: 'Name goes here'
     } } }) do
 
       with_concat_form_for(@user) do |f|
@@ -65,7 +82,7 @@ class InputFieldTest < ActionView::TestCase
 
   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
+      f.input_field :age, as: :integer
     end
 
     assert_select 'input[min=18]'
@@ -73,7 +90,7 @@ class InputFieldTest < ActionView::TestCase
 
   test 'builder input_field should use pattern component' do
     with_concat_form_for(@other_validating_user) do |f|
-      f.input_field :country, :as => :string
+      f.input_field :country, as: :string
     end
 
     assert_select 'input[pattern="\w+"]'
@@ -81,7 +98,7 @@ class InputFieldTest < ActionView::TestCase
 
   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
+      f.input_field :age, as: :integer, readonly: true
     end
 
     assert_select 'input.integer.readonly[readonly]'
@@ -89,7 +106,7 @@ class InputFieldTest < ActionView::TestCase
 
   test 'builder input_field should use maxlength component' do
     with_concat_form_for(@validating_user) do |f|
-      f.input_field :name, :as => :string
+      f.input_field :name, as: :string
     end
 
     assert_select 'input.string[maxlength=25]'
@@ -97,7 +114,7 @@ class InputFieldTest < ActionView::TestCase
 
   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
+      f.input_field :status, collection: ['Open', 'Closed'], class: 'status', label_method: :to_s, value_method: :to_s
     end
 
     assert_no_select 'select.status[input_html]'

data/test/form_builder/label_test.rb

@@ -14,12 +14,12 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'builder should generate a label for the boolean attrbiute' do
-    with_label_for @user, :name, :as => :boolean
+    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
+  test 'builder should generate a label component tag with a clean HTML' do
     with_label_for @user, :name
     assert_no_select 'label.string[label_html]'
   end
@@ -29,33 +29,23 @@ class LabelTest < ActionView::TestCase
     assert_select 'label.string.required[for=validating_user_name]', /Name/
   end
 
-  test 'builder should escape label text' do
-    with_label_for @user, :name, :label => '<script>alert(1337)</script>', :required => false
-    assert_select 'label.string', "&lt;script&gt;alert(1337)&lt;/script&gt;"
-  end
-
-  test 'builder should not escape label text if it is safe' do
-    with_label_for @user, :name, :label => '<script>alert(1337)</script>'.html_safe, :required => false
-    assert_select 'label.string script', "alert(1337)"
-  end
-
   test 'builder should allow passing options to label tag' do
-    with_label_for @user, :name, :label => 'My label', :id => 'name_label'
+    with_label_for @user, :name, label: 'My label', id: 'name_label'
     assert_select 'label.string#name_label', /My label/
   end
 
   test 'builder label should generate label tag with clean HTML' do
-    with_label_for @user, :name, :label => 'My label', :required => true, :id => 'name_label'
+    with_label_for @user, :name, label: 'My label', required: true, id: 'name_label'
     assert_select 'label.string#name_label', /My label/
     assert_no_select 'label[label]'
     assert_no_select 'label[required]'
   end
 
   test 'builder should not modify the options hash' do
-    options = { :label => 'My label', :id => 'name_label' }
+    options = { label: 'My label', id: 'name_label' }
     with_label_for @user, :name, options
     assert_select 'label.string#name_label', /My label/
-    assert_equal({ :label => 'My label', :id => 'name_label' }, options)
+    assert_equal({ label: 'My label', id: 'name_label' }, options)
   end
 
   test 'builder should fallback to default label when string is given' do
@@ -73,7 +63,7 @@ class LabelTest < ActionView::TestCase
   end
 
   test 'builder allows label order to be changed' do
-    swap SimpleForm, :label_text => lambda { |l, r| "#{l}:" } do
+    swap SimpleForm, label_text: lambda { |l, r| "#{l}:" } do
       with_label_for @user, :age
       assert_select 'label.integer[for=user_age]', "Age:"
     end

data/test/form_builder/wrapper_test.rb

@@ -38,7 +38,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'wrapper should add hint class for attribute with a hint' do
-    with_form_for @user, :name, :hint => 'hint'
+    with_form_for @user, :name, hint: 'hint'
     assert_select 'div.field_with_hint'
   end
 
@@ -48,18 +48,18 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'wrapper should have disabled class when input is disabled' do
-    with_form_for @user, :active, :disabled => true
+    with_form_for @user, :active, disabled: true
     assert_select 'div.disabled'
   end
 
   test 'wrapper should support no wrapping when wrapper is false' do
-    with_form_for @user, :name, :wrapper => false
+    with_form_for @user, :name, wrapper: false
     assert_select 'form > label[for=user_name]'
     assert_select 'form > input#user_name.string'
   end
 
   test 'wrapper should support no wrapping when wrapper tag is false' do
-    with_form_for @user, :name, :wrapper => custom_wrapper_without_top_level
+    with_form_for @user, :name, wrapper: custom_wrapper_without_top_level
     assert_select 'form > label[for=user_name]'
     assert_select 'form > input#user_name.string'
   end
@@ -68,28 +68,28 @@ class WrapperTest < ActionView::TestCase
     with_form_for @user, :name
     assert_select 'form div.input.required.string'
 
-    with_form_for @user, :age, :required => false
+    with_form_for @user, :age, required: false
     assert_select 'form div.input.optional.integer'
   end
 
   test 'wrapper should allow custom options to be given' do
-    with_form_for @user, :name, :wrapper_html => { :id => "super_cool", :class => 'yay' }
+    with_form_for @user, :name, wrapper_html: { id: "super_cool", class: 'yay' }
     assert_select 'form #super_cool.required.string.yay'
   end
 
   test 'wrapper should allow tag to be given on demand' do
-    with_form_for @user, :name, :wrapper_tag => :b
+    with_form_for @user, :name, wrapper_tag: :b
     assert_select 'form b.required.string'
   end
 
   test 'wrapper should allow wrapper class to be given on demand' do
-    with_form_for @user, :name, :wrapper_class => :wrapper
+    with_form_for @user, :name, wrapper_class: :wrapper
     assert_select 'form div.wrapper.required.string'
   end
 
   test 'wrapper should skip additional classes when configured' do
-    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
-      with_form_for @user, :name, :wrapper_class => :wrapper
+    swap SimpleForm, generate_additional_classes_for: [:input, :label] do
+      with_form_for @user, :name, wrapper_class: :wrapper
       assert_select 'form div.wrapper'
       assert_no_select 'div.required'
       assert_no_select 'div.string'
@@ -98,7 +98,7 @@ class WrapperTest < ActionView::TestCase
   end
 
   test 'wrapper should not generate empty css class' do
-    swap SimpleForm, :generate_additional_classes_for => [:input, :label] do
+    swap SimpleForm, generate_additional_classes_for: [:input, :label] do
       swap_wrapper :default, custom_wrapper_without_class do
         with_form_for @user, :name
         assert_no_select 'div#custom_wrapper_without_class[class]'
@@ -110,7 +110,7 @@ class WrapperTest < ActionView::TestCase
 
   test 'custom wrappers works' do
     swap_wrapper do
-      with_form_for @user, :name, :hint => "cool"
+      with_form_for @user, :name, hint: "cool"
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
       assert_no_select "section.custom_wrapper div.another_wrapper span.omg_error"
@@ -121,7 +121,7 @@ class WrapperTest < ActionView::TestCase
 
   test 'custom wrappers can be turned off' do
     swap_wrapper do
-      with_form_for @user, :name, :another => false
+      with_form_for @user, :name, another: false
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
       assert_select "section.custom_wrapper div.error_wrapper span.omg_error"
@@ -137,7 +137,7 @@ class WrapperTest < ActionView::TestCase
       assert_no_select "section.custom_wrapper div.another_wrapper label"
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
 
-      with_concat_form_for(@user, :wrapper => :another) do |f|
+      with_concat_form_for(@user, wrapper: :another) do |f|
         f.input :name
       end
 
@@ -153,20 +153,20 @@ class WrapperTest < ActionView::TestCase
       assert_no_select "section.custom_wrapper div.another_wrapper input.string"
       output_buffer.replace ""
 
-      with_form_for @user, :name, :wrapper => :another
+      with_form_for @user, :name, wrapper: :another
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
       output_buffer.replace ""
     end
 
-    with_form_for @user, :name, :wrapper => custom_wrapper
+    with_form_for @user, :name, wrapper: custom_wrapper
     assert_select "section.custom_wrapper div.another_wrapper label"
     assert_select "section.custom_wrapper div.another_wrapper input.string"
   end
 
   test 'access wrappers with indifferent access' do
     swap_wrapper :another do
-      with_form_for @user, :name, :wrapper => "another"
+      with_form_for @user, :name, wrapper: "another"
       assert_select "section.custom_wrapper div.another_wrapper label"
       assert_select "section.custom_wrapper div.another_wrapper input.string"
     end
@@ -175,8 +175,8 @@ class WrapperTest < ActionView::TestCase
   test 'do not duplicate label classes for different inputs' do
     swap_wrapper :default, self.custom_wrapper_with_label_html_option do
       with_concat_form_for(@user) do |f|
-        concat f.input :name, :required => false
-        concat f.input :email, :as => :email, :required => true
+        concat f.input :name, required: false
+        concat f.input :email, as: :email, required: true
       end
 
       assert_select "label.string.optional.extra-label-class[for='user_name']"
@@ -187,13 +187,13 @@ class WrapperTest < ActionView::TestCase
 
   test 'raise error when wrapper not found' do
     assert_raise SimpleForm::WrapperNotFound do
-      with_form_for @user, :name, :wrapper => :not_found
+      with_form_for @user, :name, wrapper: :not_found
     end
   end
 
   test 'use wrapper for specified in config mapping' do
     swap_wrapper :another do
-      swap SimpleForm, :wrapper_mappings => { :string => :another } do
+      swap SimpleForm, wrapper_mappings: { string: :another } do
         with_form_for @user, :name
         assert_select "section.custom_wrapper div.another_wrapper label"
         assert_select "section.custom_wrapper div.another_wrapper input.string"

data/test/inputs/boolean_input_test.rb

@@ -9,26 +9,26 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input does not generate the label with the checkbox when label option is false' do
-    with_input_for @user, :active, :boolean, :label => false
+    with_input_for @user, :active, :boolean, label: false
     assert_select 'input[type=checkbox].boolean#user_active'
     assert_no_select 'label'
   end
 
   test 'input uses custom checked value' do
     @user.action = 'on'
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=checkbox][value=on][checked=checked]'
   end
 
   test 'input uses custom unchecked value' do
     @user.action = 'off'
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=checkbox][value=on]'
     assert_no_select 'input[checked=checked][value=on]'
   end
 
   test 'input generates hidden input with custom unchecked value' do
-    with_input_for @user, :action, :boolean, :checked_value => 'on', :unchecked_value => 'off'
+    with_input_for @user, :action, :boolean, checked_value: 'on', unchecked_value: 'off'
     assert_select 'input[type=hidden][value=off]'
   end
 
@@ -39,7 +39,7 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input allows changing default boolean style config to nested, generating a default label and a manual hidden field for checkbox' do
-    swap SimpleForm, :boolean_style => :nested do
+    swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean
       assert_select 'label[for=user_active]', 'Active'
       assert_select 'label.boolean > input.boolean'
@@ -48,21 +48,21 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input boolean with nested allows :inline_label' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :label => false, :inline_label => 'I am so inline.'
-      assert_select 'label.checkbox', :text => 'I am so inline.'
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, label: false, inline_label: 'I am so inline.'
+      assert_select 'label.checkbox', text: 'I am so inline.'
     end
   end
 
   test 'input boolean with nested style creates an inline label using the default label text when inline_label option set to true' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :label => false, :inline_label => true
-      assert_select 'label.checkbox', :text => 'Active'
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, label: false, inline_label: true
+      assert_select 'label.checkbox', text: 'Active'
     end
   end
 
   test 'input boolean with nested generates a manual hidden field for checkbox outside the label, to recreate Rails functionality with valid html5' do
-    swap SimpleForm, :boolean_style => :nested do
+    swap SimpleForm, boolean_style: :nested do
       with_input_for @user, :active, :boolean
 
       assert_select "input[type=hidden][name='user[active]'] + label.boolean > input.boolean"
@@ -71,23 +71,23 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input boolean with nested generates a disabled hidden field for checkbox outside the label, if the field is disabled' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :disabled => true
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, disabled: true
 
       assert_select "input[type=hidden][name='user[active]'][disabled] + label.boolean > input.boolean[disabled]"
     end
   end
 
   test 'input accepts changing boolean style to nested through given options' do
-    with_input_for @user, :active, :boolean, :boolean_style => :nested
+    with_input_for @user, :active, :boolean, boolean_style: :nested
     assert_select 'label[for=user_active]', 'Active'
     assert_select 'label.boolean > input.boolean'
     assert_no_select 'input[type=checkbox] + label'
   end
 
   test 'input accepts changing boolean style to inline through given options, when default is nested' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :boolean_style => :inline
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, boolean_style: :inline
       assert_select 'label[for=user_active]', 'Active'
       assert_select 'input.boolean + label.boolean'
       assert_no_select 'label > input'
@@ -95,16 +95,16 @@ class BooleanInputTest < ActionView::TestCase
   end
 
   test 'input with nested style allows disabling label' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :label => false
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, label: false
       assert_select 'input.boolean'
       assert_no_select 'label.boolean'
     end
   end
 
   test 'input with nested style allows customizing input_html' do
-    swap SimpleForm, :boolean_style => :nested do
-      with_input_for @user, :active, :boolean, :input_html => { :name => 'active_user' }
+    swap SimpleForm, boolean_style: :nested do
+      with_input_for @user, :active, :boolean, input_html: { name: 'active_user' }
       assert_select "input[type=hidden][name=active_user] + label.boolean > input.boolean[name=active_user]"
     end
   end
@@ -120,7 +120,7 @@ class BooleanInputTest < ActionView::TestCase
 
   test 'input boolean with nested style works using :input only in wrapper config (no label_input), adding the extra "checkbox" label wrapper' do
     swap_wrapper do
-      swap SimpleForm, :boolean_style => :nested do
+      swap SimpleForm, boolean_style: :nested do
         with_input_for @user, :active, :boolean
 
         assert_select 'label.boolean + input[type=hidden] + label.checkbox > input.boolean'
@@ -130,7 +130,7 @@ class BooleanInputTest < ActionView::TestCase
 
   test 'input boolean with nested style works using :label_input in wrapper config, adding "checkbox" class to label' do
     swap_wrapper :default, self.custom_wrapper_without_top_level do
-      swap SimpleForm, :boolean_style => :nested do
+      swap SimpleForm, boolean_style: :nested do
         with_input_for @user, :active, :boolean
 
         assert_select 'input[type=hidden] + label.boolean.checkbox > input.boolean'
@@ -140,7 +140,7 @@ class BooleanInputTest < ActionView::TestCase
 
   test 'input boolean without additional classes should add "checkbox" class to label' do
     swap_wrapper :default, self.custom_wrapper_without_top_level do
-      swap SimpleForm, :boolean_style => :nested, :generate_additional_classes_for => [:input] do
+      swap SimpleForm, boolean_style: :nested, generate_additional_classes_for: [:input] do
         with_input_for @user, :active, :boolean
 
         assert_select 'label'