simple_form 2.1.0 → 3.0.0

data/test/form_builder/general_test.rb

@@ -22,16 +22,24 @@ class FormBuilderTest < ActionView::TestCase
     end
   end
 
+  test 'builder should work without controller' do
+    stub_any_instance ActionView::TestCase, :controller, nil do
+      simple_form_for @user do |f|
+        assert f.input(:name)
+      end
+    end
+  end
+
   test 'builder input should allow a block to configure input' do
     with_form_for @user, :name do
-      text_field_tag :foo, :bar, :id => :cool
+      text_field_tag :foo, :bar, id: :cool
     end
     assert_no_select 'input.string'
     assert_select 'input#cool'
   end
 
   test 'builder should allow adding custom input mappings for default input types' do
-    swap SimpleForm, :input_mappings => { /count$/ => :integer } do
+    swap SimpleForm, input_mappings: { /count$/ => :integer } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.string'
       assert_select 'form input#user_post_count.numeric.integer'
@@ -39,7 +47,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow to skip input_type class' do
-    swap SimpleForm, :generate_additional_classes_for => [:label, :wrapper] 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"
       assert_select "form input#user_post_count"
@@ -47,7 +55,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow to add additional classes only for wrapper' do
-    swap SimpleForm, :generate_additional_classes_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"
@@ -56,7 +64,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow adding custom input mappings for integer input types' do
-    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+    swap SimpleForm, input_mappings: { /lock_version/ => :hidden } do
       with_form_for @user, :lock_version
       assert_no_select 'form input#user_lock_version.integer'
       assert_select 'form input#user_lock_version.hidden'
@@ -64,7 +72,7 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder uses the first matching custom input map when more than one matches' do
-    swap SimpleForm, :input_mappings => { /count$/ => :integer, /^post_/ => :password } do
+    swap SimpleForm, input_mappings: { /count$/ => :integer, /^post_/ => :password } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.password'
       assert_select 'form input#user_post_count.numeric.integer'
@@ -72,13 +80,26 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder uses the custom map only for matched attributes' do
-    swap SimpleForm, :input_mappings => { /lock_version/ => :hidden } do
+    swap SimpleForm, input_mappings: { /lock_version/ => :hidden } do
       with_form_for @user, :post_count
       assert_no_select 'form input#user_post_count.hidden'
       assert_select 'form input#user_post_count.string'
     end
   end
 
+  test 'builder allow to use numbers in the model name' do
+    user = UserNumber1And2.build(tags: [Tag.new(nil, 'Tag1')])
+
+    with_concat_form_for(user, url: '/') do |f|
+      f.simple_fields_for(:tags) do |tags|
+        tags.input :name
+      end
+    end
+
+    assert_select 'form .user_number1_and2_tags_name'
+    assert_no_select 'form .user_number1_and2_tags_1_name'
+  end
+
   # INPUT TYPES
   test 'builder should generate text fields for string columns' do
     with_form_for @user, :name
@@ -156,64 +177,62 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should generate file for file columns' do
-    @user.avatar = mock("file")
-    @user.avatar.expects(:respond_to?).with(:mounted_as).returns(false)
-    @user.avatar.expects(:respond_to?).with(:file?).returns(false)
-    @user.avatar.expects(:respond_to?).with(:public_filename).returns(true)
+    @user.avatar = MiniTest::Mock.new
+    @user.avatar.expect(:public_filename, true)
 
     with_form_for @user, :avatar
     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
-    @user.home_picture = mock("file")
-    @user.home_picture.expects(:respond_to?).with(:mounted_as).returns(true)
+    @user.home_picture = MiniTest::Mock.new
+    @user.home_picture.expect(:mounted_as, true)
 
     with_form_for @user, :home_picture
     assert_select 'form input#user_home_picture.file'
   end
 
   test 'build should generate select if a collection is given' do
-    with_form_for @user, :age, :collection => 1..60
+    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
-    with_form_for @user, :name, :as => :text
+    with_form_for @user, :name, as: :text
     assert_no_select 'form input#user_name'
     assert_select 'form textarea#user_name.text'
 
-    with_form_for @user, :active, :as => :radio_buttons
+    with_form_for @user, :active, as: :radio_buttons
     assert_no_select 'form input[type=checkbox]'
-    assert_select 'form input.radio_buttons[type=radio]', :count => 2
+    assert_select 'form input.radio_buttons[type=radio]', count: 2
 
-    with_form_for @user, :born_at, :as => :string
+    with_form_for @user, :born_at, as: :string
     assert_no_select 'form select'
     assert_select 'form input#user_born_at.string'
   end
 
   # COMMON OPTIONS
   test 'builder should add chosen form class' do
-    swap SimpleForm, :form_class => :my_custom_class do
+    swap SimpleForm, form_class: :my_custom_class do
       with_form_for @user, :name
       assert_select 'form.my_custom_class'
     end
   end
 
   test 'builder should allow passing options to input' do
-    with_form_for @user, :name, :input_html => { :class => 'my_input', :id => 'my_input' }
+    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
-    with_form_for @user, :name, :input_html => { :class => 'my_input', :id => 'my_input' }
+    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
-      with_form_for @user, :name, :input_html => { :class => 'my_input' }
+      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
@@ -221,7 +240,7 @@ class FormBuilderTest < ActionView::TestCase
 
   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' }
+      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
@@ -233,22 +252,22 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should be able to disable the label for a input' do
-    with_form_for @user, :name, :label => false
+    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
-    with_form_for @user, :name, :label => false, :wrapper => custom_wrapper_with_wrapped_label_input
+    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!'
+    with_form_for @user, :name, label: 'Yay!'
     assert_select 'form label', /Yay!/
   end
 
   test 'builder should pass options to label' do
-    with_form_for @user, :name, :label_html => { :id => "cool" }
+    with_form_for @user, :name, label_html: { id: "cool" }
     assert_select 'form label#cool', /Name/
   end
 
@@ -258,21 +277,21 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should be able to add a hint for a input' do
-    with_form_for @user, :name, :hint => 'test'
+    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
-    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'
+    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
+        assert_no_select 'span.hint'
+      end
     end
   end
 
   test 'builder should pass options to hint' do
-    with_form_for @user, :name, :hint => 'test', :hint_html => { :id => "cool" }
+    with_form_for @user, :name, hint: 'test', hint_html: { id: "cool" }
     assert_select 'span.hint#cool', 'test'
   end
 
@@ -287,20 +306,20 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should be able to disable showing errors for a input' do
-    with_form_for @user, :name, :error => false
+    with_form_for @user, :name, error: false
     assert_no_select 'span.error'
   end
 
   test 'builder should pass options to errors' do
-    with_form_for @user, :name, :error_html => { :id => "cool" }
+    with_form_for @user, :name, error_html: { id: "cool" }
     assert_select 'span.error#cool', "can't be blank"
   end
 
   test 'placeholder should not be generated when set to false' 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_form_for @user, :name, :placeholder => false
+      with_form_for @user, :name, placeholder: false
       assert_no_select 'input[placeholder]'
     end
   end
@@ -308,14 +327,14 @@ 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
-      with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
+      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|
+      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
@@ -327,7 +346,7 @@ class FormBuilderTest < ActionView::TestCase
     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|
+      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))
@@ -340,29 +359,29 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   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' }
+    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
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class' } } do |f|
-      f.input_field :name, :id => 'specific_id'
+    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' }
+    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
-    with_concat_form_for @user, :defaults => { :input_html => { :class => 'default_class', :id => 'default_id' } } do |f|
-      f.input_field :name, :id => 'specific_id'
+    with_concat_form_for @user, defaults: { input_html: { class: 'default_class', id: 'default_id' } } do |f|
+      f.input_field :name, id: 'specific_id'
     end
     assert_select 'input.default_class#specific_id'
   end
@@ -386,9 +405,9 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder should allow overriding input type when object is not present' do
-    with_form_for :project, :created_at, :as => :datetime
+    with_form_for :project, :created_at, as: :datetime
     assert_select 'form select.datetime#project_created_at_1i'
-    with_form_for :project, :budget, :as => :decimal
+    with_form_for :project, :budget, as: :decimal
     assert_select 'form input.decimal#project_budget'
   end
 

data/test/form_builder/hint_test.rb

@@ -14,36 +14,36 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should be generated with optional text' do
-    with_hint_for @user, :name, :hint => 'Use with care...'
+    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
-    options = { :hint => 'Use with care...' }
+    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)
+    assert_equal({ hint: 'Use with care...' }, options)
   end
 
   test 'hint should be generated cleanly with optional text' do
-    with_hint_for @user, :name, :hint => 'Use with care...', :hint_tag => :span
+    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]'
     assert_no_select 'span.hint[hint_html]'
   end
 
   test 'hint uses the current component tag set' do
-    with_hint_for @user, :name, :hint => 'Use with care...', :hint_tag => :p
+    with_hint_for @user, :name, hint: 'Use with care...', hint_tag: :p
     assert_select 'p.hint', 'Use with care...'
   end
 
   test 'hint should be able to pass html options' do
-    with_hint_for @user, :name, :hint => 'Yay!', :id => 'hint', :class => 'yay'
+    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
-    with_hint_for @user, :name, :hint => '<b>Bold</b> and not...'
+    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'
     assert_select 'span.hint', 'Bold and not...'
   end
 
@@ -61,22 +61,22 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint without attribute name uses the current component tag set' do
-    with_hint_for @user, 'Hello World!', :hint_tag => :p
+    with_hint_for @user, 'Hello World!', hint_tag: :p
     assert_no_select 'p.hint[hint]'
     assert_no_select 'p.hint[hint_html]'
     assert_no_select 'p.hint[hint_tag]'
   end
 
   test 'hint without attribute name should be able to pass html options' do
-    with_hint_for @user, 'Yay', :id => 'hint', :class => 'yay'
+    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
-    store_translations(:en, :simple_form => { :hints => { :user => {
-      :edit => { :name => 'Content of this input will be truncated...' }
+    store_translations(:en, simple_form: { hints: { user: {
+      edit: { name: 'Content of this input will be truncated...' }
     } } }) do
       with_hint_for @user, :name
       assert_select 'span.hint', 'Content of this input will be truncated...'
@@ -84,8 +84,8 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should use i18n with model and attribute to lookup translation' do
-    store_translations(:en, :simple_form => { :hints => { :user => {
-      :name => 'Content of this input will be capitalized...'
+    store_translations(:en, simple_form: { hints: { user: {
+      name: 'Content of this input will be capitalized...'
     } } }) do
       with_hint_for @user, :name
       assert_select 'span.hint', 'Content of this input will be capitalized...'
@@ -93,8 +93,8 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should use i18n under defaults namespace to lookup translation' do
-    store_translations(:en, :simple_form => {
-      :hints => {:defaults => {:name => 'Content of this input will be downcased...' } }
+    store_translations(:en, simple_form: {
+      hints: { defaults: { name: 'Content of this input will be downcased...' } }
     }) do
       with_hint_for @user, :name
       assert_select 'span.hint', 'Content of this input will be downcased...'
@@ -102,17 +102,17 @@ class HintTest < ActionView::TestCase
   end
 
   test 'hint should use i18n with lookup for association name' do
-    store_translations(:en, :simple_form => { :hints => {
-      :user => { :company => 'My company!' }
+    store_translations(:en, simple_form: { hints: {
+      user: { company: 'My company!' }
     } } ) do
-      with_hint_for @user, :company_id, :as => :string, :reflection => Association.new(Company, :company, {})
+      with_hint_for @user, :company_id, as: :string, reflection: Association.new(Company, :company, {})
       assert_select 'span.hint', /My company!/
     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...' }
+    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...'
@@ -123,7 +123,7 @@ class HintTest < ActionView::TestCase
   # No object
 
   test 'hint should generate properly when object is not present' do
-    with_hint_for :project, :name, :hint => 'Test without object'
+    with_hint_for :project, :name, hint: 'Test without object'
     assert_select 'span.hint', 'Test without object'
   end
 
@@ -131,7 +131,7 @@ class HintTest < ActionView::TestCase
 
   test 'hint with custom wrappers works' do
     swap_wrapper do
-      with_hint_for @user, :name, :hint => "can't be blank"
+      with_hint_for @user, :name, hint: "can't be blank"
       assert_select 'div.omg_hint', "can't be blank"
     end
   end

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
@@ -30,22 +30,22 @@ class LabelTest < ActionView::TestCase
   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
@@ -63,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