simple_form 2.1.0 → 3.0.0

data/test/action_view_extensions/builder_test.rb

@@ -49,8 +49,7 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio checks the correct value to local variables" do
-    user = User.new
-    user.active = false
+    user = User.build(active: false)
     with_collection_radio_buttons user, :active, [true, false], :to_s, :to_s
 
     assert_select 'form input[type=radio][value=true]'
@@ -58,21 +57,21 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio accepts checked item" do
-    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => true
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, checked: true
 
     assert_select 'form input[type=radio][value=true][checked=checked]'
     assert_no_select 'form input[type=radio][value=false][checked=checked]'
   end
 
   test "collection radio accepts checked item which has a value of false" do
-    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, :checked => false
+    with_collection_radio_buttons @user, :active, [[1, true], [0, false]], :last, :first, checked: false
     assert_no_select 'form input[type=radio][value=true][checked=checked]'
     assert_select 'form input[type=radio][value=false][checked=checked]'
   end
 
   test "collection radio accepts multiple disabled items" do
     collection = [[1, true], [0, false], [2, 'other']]
-    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => [true, false]
+    with_collection_radio_buttons @user, :active, collection, :last, :first, disabled: [true, false]
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -81,7 +80,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio accepts single disable item" do
     collection = [[1, true], [0, false]]
-    with_collection_radio_buttons @user, :active, collection, :last, :first, :disabled => true
+    with_collection_radio_buttons @user, :active, collection, :last, :first, disabled: true
 
     assert_select 'form input[type=radio][value=true][disabled=disabled]'
     assert_no_select 'form input[type=radio][value=false][disabled=disabled]'
@@ -89,50 +88,50 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio accepts html options as input" do
     collection = [[1, true], [0, false]]
-    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, :class => 'special-radio'
+    with_collection_radio_buttons @user, :active, collection, :last, :first, {}, class: 'special-radio'
 
     assert_select 'form input[type=radio][value=true].special-radio#user_active_true'
     assert_select 'form input[type=radio][value=false].special-radio#user_active_false'
   end
 
   test "collection radio wraps the collection in the given collection wrapper tag" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
-    assert_select 'form ul input[type=radio]', :count => 2
+    assert_select 'form ul input[type=radio]', count: 2
   end
 
   test "collection radio does not render any wrapper tag by default" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
   end
 
   test "collection radio does not wrap the collection when given falsy values" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: false
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
   end
 
   test "collection radio uses the given class for collection wrapper tag" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
-      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
+      collection_wrapper_tag: :ul, collection_wrapper_class: "items-list"
 
-    assert_select 'form ul.items-list input[type=radio]', :count => 2
+    assert_select 'form ul.items-list input[type=radio]', count: 2
   end
 
   test "collection radio uses no class for collection wrapper tag when no wrapper tag is given" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
-      :collection_wrapper_class => "items-list"
+      collection_wrapper_class: "items-list"
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form ul'
     assert_no_select '.items-list'
   end
 
   test "collection radio uses no class for collection wrapper tag by default" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
     assert_select 'form ul'
     assert_no_select 'form ul[class]'
@@ -146,13 +145,13 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection radio wraps each item in the given item wrapper tag" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: :li
 
-    assert_select 'form li input[type=radio]', :count => 2
+    assert_select 'form li input[type=radio]', count: 2
   end
 
   test "collection radio does not wrap each item when given explicitly falsy value" do
-    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+    with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: false
 
     assert_select 'form input[type=radio]'
     assert_no_select 'form span input[type=radio]'
@@ -160,25 +159,25 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio uses the given class for item wrapper tag" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
+      item_wrapper_tag: :li, item_wrapper_class: "inline"
 
-    assert_select "form li.inline input[type=radio]", :count => 2
+    assert_select "form li.inline input[type=radio]", count: 2
   end
 
   test "collection radio uses no class for item wrapper tag when no wrapper tag is given" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+      item_wrapper_tag: nil, item_wrapper_class: "inline"
 
-    assert_select 'form input[type=radio]', :count => 2
+    assert_select 'form input[type=radio]', count: 2
     assert_no_select 'form li'
     assert_no_select '.inline'
   end
 
   test "collection radio uses no class for item wrapper tag by default" do
     with_collection_radio_buttons @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => :li
+      item_wrapper_tag: :li
 
-    assert_select "form li", :count => 2
+    assert_select "form li", count: 2
     assert_no_select "form li[class]"
   end
 
@@ -209,7 +208,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio with block helpers accept extra html options" do
     with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => "radio_button") + b.radio_button(:class => "radio_button")
+      b.label(class: "radio_button") + b.radio_button(class: "radio_button")
     end
 
     assert_select 'label.radio_button[for=user_active_true] + input#user_active_true.radio_button[type=radio]'
@@ -231,7 +230,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection radio with block helpers allows access to the current object item in the collection to access extra properties" do
     with_collection_radio_buttons :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => b.object) { b.radio_button + b.text }
+      b.label(class: b.object) { b.radio_button + b.text }
     end
 
     assert_select 'label.true[for=user_active_true]', 'true' do
@@ -245,33 +244,20 @@ class BuilderTest < ActionView::TestCase
   test "collection radio with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
       collection_input =  f.collection_radio_buttons :active, [true, false], :to_s, :to_s do |b|
-        b.label(:class => b.object) { b.radio_button + b.text }
+        b.label(class: b.object) { b.radio_button + b.text }
       end
       concat collection_input
 
       concat f.hidden_field :name
     end
 
-    assert_select 'label.true[for=user_active_true]', :text => 'true', :count => 1 do
+    assert_select 'label.true[for=user_active_true]', text: 'true', count: 1 do
       assert_select 'input#user_active_true[type=radio]'
     end
-    assert_select 'label.false[for=user_active_false]', :text => 'false', :count => 1 do
+    assert_select 'label.false[for=user_active_false]', text: 'false', count: 1 do
       assert_select 'input#user_active_false[type=radio]'
     end
   end
-
-  test "collection_radio helper is deprecated in favor of collection_radio_buttons" do
-    assert_deprecated "[SIMPLE_FORM] The `collection_radio` helper is deprecated, " \
-      "please use `collection_radio_buttons` instead" do
-      with_concat_form_for(@user) do |f|
-        f.collection_radio :active, [true, false], :to_s, :to_s
-      end
-    end
-
-    assert_select 'input[type=radio][value=true]'
-    assert_select 'input[type=radio][value=false]'
-  end
-
   # COLLECTION CHECK BOX
   test "collection check box accepts a collection and generate a serie of checkboxes for value method" do
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
@@ -285,7 +271,7 @@ class BuilderTest < ActionView::TestCase
     collection = [Tag.new(1, 'Tag 1'), Tag.new(2, 'Tag 2')]
     with_collection_check_boxes @user, :tag_ids, collection, :id, :name
 
-    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", :count => 1
+    assert_select "form input[type=hidden][name='user[tag_ids][]'][value=]", count: 1
   end
 
   test "collection check box accepts a collection and generate a serie of checkboxes with labels for label method" do
@@ -310,9 +296,9 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box checks the correct value to local variables" do
-    user = User.new
-    user.tag_ids = [1, 3]
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    user = User.build(tag_ids: [1, 3])
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+
     with_collection_check_boxes user, :tag_ids, collection, :first, :last
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -321,8 +307,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts selected values as :checked option" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
@@ -330,8 +316,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check boxes accepts selected string values as :checked option" do
-    collection = (1..3).map{|i| [i, "Category #{i}"] }
-    with_collection_check_boxes :user, :category_ids, collection, :first, :last, :checked => ['1', '3']
+    collection = (1..3).map { |i| [i, "Category #{i}"] }
+    with_collection_check_boxes :user, :category_ids, collection, :first, :last, checked: ['1', '3']
 
     assert_select 'input[type=checkbox][value=1][checked=checked]'
     assert_select 'input[type=checkbox][value=3][checked=checked]'
@@ -339,8 +325,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts a single checked value" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => 3
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: 3
 
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
     assert_no_select 'form input[type=checkbox][value=1][checked=checked]'
@@ -348,9 +334,9 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts selected values as :checked option and override the model values" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     @user.tag_ids = [2]
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :checked => [1, 3]
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, checked: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][checked=checked]'
     assert_select 'form input[type=checkbox][value=3][checked=checked]'
@@ -358,8 +344,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts multiple disabled items" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => [1, 3]
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: [1, 3]
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -367,8 +353,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts single disable item" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => 1
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: 1
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -376,8 +362,8 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check box accepts a proc to disabled items" do
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, :disabled => proc { |i| i.first == 1 }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, disabled: proc { |i| i.first == 1 }
 
     assert_select 'form input[type=checkbox][value=1][disabled=disabled]'
     assert_no_select 'form input[type=checkbox][value=3][disabled=disabled]'
@@ -386,7 +372,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check box accepts html options" do
     collection = [[1, 'Tag 1'], [2, 'Tag 2']]
-    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, :class => 'check'
+    with_collection_check_boxes @user, :tag_ids, collection, :first, :last, {}, class: 'check'
 
     assert_select 'form input.check[type=checkbox][value=1]'
     assert_select 'form input.check[type=checkbox][value=2]'
@@ -408,43 +394,43 @@ class BuilderTest < ActionView::TestCase
   end
 
   test "collection check boxes wraps the collection in the given collection wrapper tag" do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
-    assert_select 'form ul input[type=checkbox]', :count => 2
+    assert_select 'form ul input[type=checkbox]', count: 2
   end
 
   test "collection check boxes does not render any wrapper tag by default" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
   end
 
   test "collection check boxes does not wrap the collection when given falsy values" do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => false
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: false
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
   end
 
   test "collection check boxes uses the given class for collection wrapper tag" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
-      :collection_wrapper_tag => :ul, :collection_wrapper_class => "items-list"
+      collection_wrapper_tag: :ul, collection_wrapper_class: "items-list"
 
-    assert_select 'form ul.items-list input[type=checkbox]', :count => 2
+    assert_select 'form ul.items-list input[type=checkbox]', count: 2
   end
 
   test "collection check boxes uses no class for collection wrapper tag when no wrapper tag is given" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
-      :collection_wrapper_class => "items-list"
+      collection_wrapper_class: "items-list"
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form ul'
     assert_no_select '.items-list'
   end
 
   test "collection check boxes uses no class for collection wrapper tag by default" do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :collection_wrapper_tag => :ul
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, collection_wrapper_tag: :ul
 
     assert_select 'form ul'
     assert_no_select 'form ul[class]'
@@ -453,17 +439,17 @@ class BuilderTest < ActionView::TestCase
   test "collection check boxes wrap items in a span tag by default" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s
 
-    assert_select 'form span input[type=checkbox]', :count => 2
+    assert_select 'form span input[type=checkbox]', count: 2
   end
 
   test "collection check boxes wraps each item in the given item wrapper tag" do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => :li
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: :li
 
-    assert_select 'form li input[type=checkbox]', :count => 2
+    assert_select 'form li input[type=checkbox]', count: 2
   end
 
   test "collection check boxes does not wrap each item when given explicitly falsy value" do
-    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, :item_wrapper_tag => false
+    with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s, item_wrapper_tag: false
 
     assert_select 'form input[type=checkbox]'
     assert_no_select 'form span input[type=checkbox]'
@@ -471,25 +457,25 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes uses the given class for item wrapper tag" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => :li, :item_wrapper_class => "inline"
+      item_wrapper_tag: :li, item_wrapper_class: "inline"
 
-    assert_select "form li.inline input[type=checkbox]", :count => 2
+    assert_select "form li.inline input[type=checkbox]", count: 2
   end
 
   test "collection check boxes uses no class for item wrapper tag when no wrapper tag is given" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => nil, :item_wrapper_class => "inline"
+      item_wrapper_tag: nil, item_wrapper_class: "inline"
 
-    assert_select 'form input[type=checkbox]', :count => 2
+    assert_select 'form input[type=checkbox]', count: 2
     assert_no_select 'form li'
     assert_no_select '.inline'
   end
 
   test "collection check boxes uses no class for item wrapper tag by default" do
     with_collection_check_boxes @user, :active, [true, false], :to_s, :to_s,
-      :item_wrapper_tag => :li
+      item_wrapper_tag: :li
 
-    assert_select "form li", :count => 2
+    assert_select "form li", count: 2
     assert_no_select "form li[class]"
   end
 
@@ -520,7 +506,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes with block helpers accept extra html options" do
     with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => "check_box") + b.check_box(:class => "check_box")
+      b.label(class: "check_box") + b.check_box(class: "check_box")
     end
 
     assert_select 'label.check_box[for=user_active_true] + input#user_active_true.check_box[type=checkbox]'
@@ -542,7 +528,7 @@ class BuilderTest < ActionView::TestCase
 
   test "collection check boxes with block helpers allows access to the current object item in the collection to access extra properties" do
     with_collection_check_boxes :user, :active, [true, false], :to_s, :to_s do |b|
-      b.label(:class => b.object) { b.check_box + b.text }
+      b.label(class: b.object) { b.check_box + b.text }
     end
 
     assert_select 'label.true[for=user_active_true]', 'true' do
@@ -556,17 +542,17 @@ class BuilderTest < ActionView::TestCase
   test "collection check boxes with block helpers does not leak the template" do
     with_concat_form_for(@user) do |f|
       collection_input =  f.collection_check_boxes :active, [true, false], :to_s, :to_s do |b|
-        b.label(:class => b.object) { b.check_box + b.text }
+        b.label(class: b.object) { b.check_box + b.text }
       end
       concat collection_input
 
       concat f.hidden_field :name
     end
 
-    assert_select 'label.true[for=user_active_true]', :text => 'true', :count => 1 do
+    assert_select 'label.true[for=user_active_true]', text: 'true', count: 1 do
       assert_select 'input#user_active_true[type=checkbox]'
     end
-    assert_select 'label.false[for=user_active_false]', :text => 'false', :count => 1 do
+    assert_select 'label.false[for=user_active_false]', text: 'false', count: 1 do
       assert_select 'input#user_active_false[type=checkbox]'
     end
   end
@@ -601,7 +587,7 @@ class BuilderTest < ActionView::TestCase
 
   test "fields for yields an instance of FormBuilder if it was set in options" do
     with_custom_form_for(:user) do |f|
-      f.simple_fields_for(:company, :builder => SimpleForm::FormBuilder) do |company|
+      f.simple_fields_for(:company, builder: SimpleForm::FormBuilder) do |company|
         assert company.instance_of?(SimpleForm::FormBuilder)
       end
     end
@@ -609,7 +595,7 @@ class BuilderTest < ActionView::TestCase
 
   test "fields inherites wrapper option from the parent form" do
     swap_wrapper :another do
-      simple_form_for(:user, :wrapper => :another) do |f|
+      simple_form_for(:user, wrapper: :another) do |f|
         f.simple_fields_for(:company) do |company|
           assert_equal :another, company.options[:wrapper]
         end
@@ -619,8 +605,8 @@ class BuilderTest < ActionView::TestCase
 
   test "fields overrides wrapper option from the parent form" do
     swap_wrapper :another do
-      simple_form_for(:user, :wrapper => :another) do |f|
-        f.simple_fields_for(:company, :wrapper => false) do |company|
+      simple_form_for(:user, wrapper: :another) do |f|
+        f.simple_fields_for(:company, wrapper: false) do |company|
           assert_equal false, company.options[:wrapper]
         end
       end

data/test/action_view_extensions/form_helper_test.rb

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