simple_form 2.1.3 → 3.0.0

data/test/form_builder/error_test.rb

@@ -14,10 +14,6 @@ class ErrorTest < ActionView::TestCase
     end
   end
 
-  def with_custom_error_for(object, *args)
-    with_form_for(object, *args)
-  end
-
   test 'error should not generate content for attribute without errors' do
     with_error_for @user, :active
     assert_no_select 'span.error'
@@ -36,38 +32,38 @@ class ErrorTest < ActionView::TestCase
 
   test 'error should generate messages for attribute with single error' do
     with_error_for @user, :name
-    assert_select 'span.error', "can&#x27;t be blank"
+    assert_select 'span.error', "can't be blank"
   end
 
   test 'error should generate messages for attribute with one error when using first' do
-    swap SimpleForm, :error_method => :first do
+    swap SimpleForm, error_method: :first do
       with_error_for @user, :age
       assert_select 'span.error', 'is not a number'
     end
   end
 
   test 'error should generate messages for attribute with several errors when using to_sentence' do
-    swap SimpleForm, :error_method => :to_sentence do
+    swap SimpleForm, error_method: :to_sentence do
       with_error_for @user, :age
       assert_select 'span.error', 'is not a number and must be greater than 18'
     end
   end
 
   test 'error should be able to pass html options' do
-    with_error_for @user, :name, :id => 'error', :class => 'yay'
+    with_error_for @user, :name, id: 'error', class: 'yay'
     assert_select 'span#error.error.yay'
   end
 
   test 'error should not modify the options hash' do
-    options = { :id => 'error', :class => 'yay' }
+    options = { id: 'error', class: 'yay' }
     with_error_for @user, :name, options
     assert_select 'span#error.error.yay'
-    assert_equal({ :id => 'error', :class => 'yay' }, options)
+    assert_equal({ id: 'error', class: 'yay' }, options)
   end
 
   test 'error should find errors on attribute and association' do
-    with_error_for @user, :company_id, :as => :select,
-      :error_method => :to_sentence, :reflection => Association.new(Company, :company, {})
+    with_error_for @user, :company_id, as: :select,
+      error_method: :to_sentence, reflection: Association.new(Company, :company, {})
     assert_select 'span.error', 'must be valid and company must be present'
   end
 
@@ -77,30 +73,16 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'error should generate an error tag with a clean HTML when errors options are present' do
-    with_error_for @user, :name, :error_tag => :p, :error_prefix => 'Name', :error_method => :first
+    with_error_for @user, :name, error_tag: :p, error_prefix: 'Name', error_method: :first
     assert_no_select 'p.error[error_html]'
     assert_no_select 'p.error[error_tag]'
     assert_no_select 'p.error[error_prefix]'
     assert_no_select 'p.error[error_method]'
   end
 
-  test 'error should escape error prefix text' do
-    with_error_for @user, :name, :error_prefix => '<b>Name</b>'
-    assert_select 'span.error', "&lt;b&gt;Name&lt;/b&gt; can&#x27;t be blank"
-  end
-
-  test 'error escapes error text' do
-    @user.errors.merge!(:action => ['must not contain <b>markup</b>'])
-
-    with_error_for @user, :action
-
-    assert_select 'span.error'
-    assert_no_select 'span.error b', 'markup'
-  end
-
   test 'error should generate an error message with raw HTML tags' do
-    with_error_for @user, :name, :error_prefix => '<b>Name</b>'.html_safe
-    assert_select 'span.error', "Name can&#x27;t be blank"
+    with_error_for @user, :name, error_prefix: '<b>Name</b>'
+    assert_select 'span.error', "Name can't be blank"
     assert_select 'span.error b', "Name"
   end
 
@@ -108,7 +90,7 @@ class ErrorTest < ActionView::TestCase
 
   test 'full error should generate an full error tag for the attribute' do
     with_full_error_for @user, :name
-    assert_select 'span.error', "Super User Name! can&#x27;t be blank"
+    assert_select 'span.error', "Super User Name! can't be blank"
   end
 
   test 'full error should generate an full error tag with a clean HTML' do
@@ -117,15 +99,15 @@ class ErrorTest < ActionView::TestCase
   end
 
   test 'full error should allow passing options to full error tag' do
-    with_full_error_for @user, :name, :id => 'name_error', :error_prefix => "Your name"
-    assert_select 'span.error#name_error', "Your name can&#x27;t be blank"
+    with_full_error_for @user, :name, id: 'name_error', error_prefix: "Your name"
+    assert_select 'span.error#name_error', "Your name can't be blank"
   end
 
   test 'full error should not modify the options hash' do
-    options = { :id => 'name_error' }
+    options = { id: 'name_error' }
     with_full_error_for @user, :name, options
-    assert_select 'span.error#name_error', "Super User Name! can&#x27;t be blank"
-    assert_equal({ :id => 'name_error' }, options)
+    assert_select 'span.error#name_error', "Super User Name! can't be blank"
+    assert_equal({ id: 'name_error' }, options)
   end
 
   # CUSTOM WRAPPERS
@@ -133,36 +115,7 @@ class ErrorTest < ActionView::TestCase
   test 'error with custom wrappers works' do
     swap_wrapper do
       with_error_for @user, :name
-      assert_select 'span.omg_error', "can&#x27;t be blank"
+      assert_select 'span.omg_error', "can't be blank"
     end
   end
-
-  # CUSTOM ERRORS
-
-  test 'input with custom error works' do
-    with_custom_error_for(@user, :name, :error => "Super User Name! can't be blank")
-
-    assert_select 'span.error', "Super User Name! can&#x27;t be blank"
-  end
-
-  test 'input with custom error does not generate the error if there is no error on the attribute' do
-    error_text = "Super User Active! can't be blank"
-    with_form_for @user, :active, :error => error_text
-
-    assert_no_select 'span.error'
-  end
-
-  test 'input with custom error escapes the error text' do
-    with_form_for @user, :name, :error => 'error must not contain <b>markup</b>'
-
-    assert_select 'span.error'
-    assert_no_select 'span.error b', 'markup'
-  end
-
-  test 'input with custom error does not escape the error text if it is safe' do
-    with_form_for @user, :name, :error => 'error must contain <b>markup</b>'.html_safe
-
-    assert_select 'span.error'
-    assert_select 'span.error b', 'markup'
-  end
 end

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,7 +80,7 @@ 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'
@@ -80,16 +88,9 @@ class FormBuilderTest < ActionView::TestCase
   end
 
   test 'builder allow to use numbers in the model name' do
-    user = UserNumber1And2.new({
-      :id => 1,
-      :name => 'New in SimpleForm!',
-      :description => 'Hello!',
-      :created_at => Time.now
-    })
+    user = UserNumber1And2.build(tags: [Tag.new(nil, 'Tag1')])
 
-    user.tags = [Tag.new(nil, 'Tag1')]
-
-    with_concat_form_for(user, :url => '/') do |f|
+    with_concat_form_for(user, url: '/') do |f|
       f.simple_fields_for(:tags) do |tags|
         tags.input :name
       end
@@ -176,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
@@ -241,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
@@ -253,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
 
@@ -278,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
 
@@ -303,24 +302,24 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should generate errors for attribute with errors' do
     with_form_for @user, :name
-    assert_select 'span.error', "can&#x27;t be blank"
+    assert_select 'span.error', "can't be blank"
   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" }
-    assert_select 'span.error#cool', "can&#x27;t be blank"
+    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
@@ -328,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
@@ -347,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))
@@ -360,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
@@ -406,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,43 +14,37 @@ 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...'.html_safe
+    with_hint_for @user, :name, hint: '<b>Bold</b> and not...'
     assert_select 'span.hint', 'Bold and not...'
-    assert_select 'span.hint b', 'Bold'
-  end
-
-  test 'builder should escape 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;"
   end
 
   # Without attribute name
@@ -67,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...'
@@ -90,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...'
@@ -99,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...'
@@ -108,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...'
@@ -129,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
 
@@ -137,8 +131,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&#x27;t be blank"
+      with_hint_for @user, :name, hint: "can't be blank"
+      assert_select 'div.omg_hint', "can't be blank"
     end
   end
 end