Stylistic pass at form_helper_test

1 files changed, 362 insertions, 286 deletions

diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 6892409081..268bab6ad2 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -15,26 +15,26 @@ class FormHelperTest < ActionView::TestCase
 
     # Create "label" locale for testing I18n label helpers
     I18n.backend.store_translations 'label', {
-      :activemodel => {
-        :attributes => {
-          :post => {
-            :cost => "Total cost"
+      activemodel: {
+        attributes: {
+          post: {
+            cost: "Total cost"
           }
         }
       },
-      :helpers => {
-        :label => {
-          :post => {
-            :body => "Write entire text here",
-            :color => {
-              :red => "Rojo"
+      helpers: {
+        label: {
+          post: {
+            body: "Write entire text here",
+            color: {
+              red: "Rojo"
             },
-            :comments => {
-              :body => "Write body here"
+            comments: {
+              body: "Write body here"
             }
           },
-          :tag => {
-            :value => "Tag"
+          tag: {
+            value: "Tag"
           }
         }
       }
@@ -42,13 +42,13 @@ class FormHelperTest < ActionView::TestCase
 
     # Create "submit" locale for testing I18n submit helpers
     I18n.backend.store_translations 'submit', {
-      :helpers => {
-        :submit => {
-          :create => 'Create %{model}',
-          :update => 'Confirm %{model} changes',
-          :submit => 'Save changes',
-          :another_post => {
-            :update => 'Update your %{model}'
+      helpers: {
+        submit: {
+          create: 'Create %{model}',
+          update: 'Confirm %{model} changes',
+          submit: 'Save changes',
+          another_post: {
+            update: 'Update your %{model}'
           }
         }
       }
@@ -57,11 +57,11 @@ class FormHelperTest < ActionView::TestCase
     @post = Post.new
     @comment = Comment.new
     def @post.errors()
-      Class.new{
+      Class.new {
         def [](field); field == "author_name" ? ["can't be empty"] : [] end
         def empty?() false end
         def count() 1 end
-        def full_messages() [ "Author name can't be empty" ] end
+        def full_messages() ["Author name can't be empty"] end
       }.new
     end
     def @post.to_key; [123]; end
@@ -96,8 +96,8 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    get "/foo", :to => "controller#action"
-    root :to => "main#index"
+    get "/foo", to: "controller#action"
+    root to: "main#index"
   end
 
   def _routes
@@ -108,9 +108,11 @@ class FormHelperTest < ActionView::TestCase
 
   def url_for(object)
     @url_for_options = object
+
     if object.is_a?(Hash) && object[:use_route].blank? && object[:controller].blank?
-      object.merge!(:controller => "main", :action => "index")
+      object.merge!(controller: "main", action: "index")
     end
+
     super
   end
 
@@ -124,10 +126,13 @@ class FormHelperTest < ActionView::TestCase
 
   def test_label
     assert_dom_equal('<label for="post_title">Title</label>', label("post", "title"))
-    assert_dom_equal('<label for="post_title">The title goes here</label>', label("post", "title", "The title goes here"))
+    assert_dom_equal(
+      '<label for="post_title">The title goes here</label>',
+      label("post", "title", "The title goes here")
+    )
     assert_dom_equal(
       '<label class="title_label" for="post_title">Title</label>',
-      label("post", "title", nil, :class => 'title_label')
+      label("post", "title", nil, class: 'title_label')
     )
     assert_dom_equal('<label for="post_secret">Secret?</label>', label("post", "secret?"))
   end
@@ -160,28 +165,31 @@ class FormHelperTest < ActionView::TestCase
 
   def test_label_with_locales_and_options
     old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_body" class="post_body">Write entire text here</label>', label(:post, :body, :class => 'post_body'))
+    assert_dom_equal(
+      '<label for="post_body" class="post_body">Write entire text here</label>',
+      label(:post, :body, class: "post_body")
+    )
   ensure
     I18n.locale = old_locale
   end
 
   def test_label_with_locales_and_value
     old_locale, I18n.locale = I18n.locale, :label
-    assert_dom_equal('<label for="post_color_red">Rojo</label>', label(:post, :color, :value => "red"))
+    assert_dom_equal('<label for="post_color_red">Rojo</label>', label(:post, :color, value: "red"))
   ensure
     I18n.locale = old_locale
   end
 
   def test_label_with_locales_and_nested_attributes
     old_locale, I18n.locale = I18n.locale, :label
-    form_for(@post, :html => { :id => 'create-post' }) do |f|
+    form_for(@post, html: { id: 'create-post' }) do |f|
       f.fields_for(:comments) do |cf|
         concat cf.label(:body)
       end
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
-      "<label for=\"post_comments_attributes_0_body\">Write body here</label>"
+    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
+      '<label for="post_comments_attributes_0_body">Write body here</label>'
     end
 
     assert_dom_equal expected, output_buffer
@@ -191,14 +199,14 @@ class FormHelperTest < ActionView::TestCase
 
   def test_label_with_locales_fallback_and_nested_attributes
     old_locale, I18n.locale = I18n.locale, :label
-    form_for(@post, :html => { :id => 'create-post' }) do |f|
+    form_for(@post, html: { id: 'create-post' }) do |f|
       f.fields_for(:tags) do |cf|
         concat cf.label(:value)
       end
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
-      "<label for=\"post_tags_attributes_0_value\">Tag</label>"
+    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
+      '<label for="post_tags_attributes_0_value">Tag</label>'
     end
 
     assert_dom_equal expected, output_buffer
@@ -207,7 +215,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_with_for_attribute_as_symbol
-    assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
+    assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, for: "my_for"))
   end
 
   def test_label_with_for_attribute_as_string
@@ -215,61 +223,93 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_label_does_not_generate_for_attribute_when_given_nil
-    assert_dom_equal('<label>Title</label>', label(:post, :title, :for => nil))
+    assert_dom_equal('<label>Title</label>', label(:post, :title, for: nil))
   end
 
   def test_label_with_id_attribute_as_symbol
-    assert_dom_equal('<label for="post_title" id="my_id">Title</label>', label(:post, :title, nil, :id => "my_id"))
+    assert_dom_equal(
+      '<label for="post_title" id="my_id">Title</label>',
+      label(:post, :title, nil, id: "my_id")
+    )
   end
 
   def test_label_with_id_attribute_as_string
-    assert_dom_equal('<label for="post_title" id="my_id">Title</label>', label(:post, :title, nil, "id" => "my_id"))
+    assert_dom_equal(
+      '<label for="post_title" id="my_id">Title</label>',
+      label(:post, :title, nil, "id" => "my_id")
+    )
   end
 
   def test_label_with_for_and_id_attributes_as_symbol
-    assert_dom_equal('<label for="my_for" id="my_id">Title</label>', label(:post, :title, nil, :for => "my_for", :id => "my_id"))
+    assert_dom_equal(
+      '<label for="my_for" id="my_id">Title</label>',
+      label(:post, :title, nil, for: "my_for", id: "my_id")
+    )
   end
 
   def test_label_with_for_and_id_attributes_as_string
-    assert_dom_equal('<label for="my_for" id="my_id">Title</label>', label(:post, :title, nil, "for" => "my_for", "id" => "my_id"))
+    assert_dom_equal(
+      '<label for="my_for" id="my_id">Title</label>',
+      label(:post, :title, nil, "for" => "my_for", "id" => "my_id")
+    )
   end
 
   def test_label_for_radio_buttons_with_value
-    assert_dom_equal('<label for="post_title_great_title">The title goes here</label>', label("post", "title", "The title goes here", :value => "great_title"))
-    assert_dom_equal('<label for="post_title_great_title">The title goes here</label>', label("post", "title", "The title goes here", :value => "great title"))
+    assert_dom_equal(
+      '<label for="post_title_great_title">The title goes here</label>',
+      label("post", "title", "The title goes here", value: "great_title")
+    )
+    assert_dom_equal(
+      '<label for="post_title_great_title">The title goes here</label>',
+      label("post", "title", "The title goes here", value: "great title")
+    )
   end
 
   def test_label_with_block
-    assert_dom_equal('<label for="post_title">The title, please:</label>', label(:post, :title) { "The title, please:" })
+    assert_dom_equal(
+      '<label for="post_title">The title, please:</label>',
+      label(:post, :title) { "The title, please:" }
+    )
   end
 
   def test_label_with_block_and_options
-    assert_dom_equal('<label for="my_for">The title, please:</label>', label(:post, :title, "for" => "my_for") { "The title, please:" })
+    assert_dom_equal(
+      '<label for="my_for">The title, please:</label>',
+      label(:post, :title, "for" => "my_for") { "The title, please:" }
+    )
   end
 
   def test_label_with_block_in_erb
-    assert_equal "<label for=\"post_message\">\n  Message\n  <input id=\"post_message\" name=\"post[message]\" type=\"text\" />\n</label>", view.render("test/label_with_block")
+    assert_equal(
+      %{<label for="post_message">\n  Message\n  <input id="post_message" name="post[message]" type="text" />\n</label>},
+      view.render("test/label_with_block")
+    )
   end
 
   def test_text_field
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" type="text" value="Hello World" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="Hello World" />',
+      text_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" type="password" />', password_field("post", "title")
+      '<input id="post_title" name="post[title]" type="password" />',
+      password_field("post", "title")
     )
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" type="password" value="Hello World" />', password_field("post", "title", :value => @post.title)
+      '<input id="post_title" name="post[title]" type="password" value="Hello World" />',
+      password_field("post", "title", value: @post.title)
     )
     assert_dom_equal(
-      '<input id="person_name" name="person[name]" type="password" />', password_field("person", "name")
+      '<input id="person_name" name="person[name]" type="password" />',
+      password_field("person", "name")
     )
   end
 
   def test_text_field_with_escapes
     @post.title = "<b>Hello World</b>"
     assert_dom_equal(
-      '<input id="post_title" name="post[title]" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
+      '<input id="post_title" name="post[title]" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />',
+      text_field("post", "title")
     )
   end
 
@@ -284,29 +324,29 @@ class FormHelperTest < ActionView::TestCase
   def test_text_field_with_options
     expected = '<input id="post_title" name="post[title]" size="35" type="text" value="Hello World" />'
     assert_dom_equal expected, text_field("post", "title", "size" => 35)
-    assert_dom_equal expected, text_field("post", "title", :size => 35)
+    assert_dom_equal expected, text_field("post", "title", size: 35)
   end
 
   def test_text_field_assuming_size
     expected = '<input id="post_title" maxlength="35" name="post[title]" size="35" type="text" value="Hello World" />'
     assert_dom_equal expected, text_field("post", "title", "maxlength" => 35)
-    assert_dom_equal expected, text_field("post", "title", :maxlength => 35)
+    assert_dom_equal expected, text_field("post", "title", maxlength: 35)
   end
 
   def test_text_field_removing_size
     expected = '<input id="post_title" maxlength="35" name="post[title]" type="text" value="Hello World" />'
     assert_dom_equal expected, text_field("post", "title", "maxlength" => 35, "size" => nil)
-    assert_dom_equal expected, text_field("post", "title", :maxlength => 35, :size => nil)
+    assert_dom_equal expected, text_field("post", "title", maxlength: 35, size: nil)
   end
 
   def test_text_field_with_nil_value
     expected = '<input id="post_title" name="post[title]" type="text" />'
-    assert_dom_equal expected, text_field("post", "title", :value => nil)
+    assert_dom_equal expected, text_field("post", "title", value: nil)
   end
 
   def test_text_field_with_nil_name
     expected = '<input id="post_title" type="text" value="Hello World" />'
-    assert_dom_equal expected, text_field("post", "title", :name => nil)
+    assert_dom_equal expected, text_field("post", "title", name: nil)
   end
 
   def test_text_field_doesnt_change_param_values
@@ -322,31 +362,41 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_hidden_field
-    assert_dom_equal '<input id="post_title" name="post[title]" type="hidden" value="Hello World" />',
+    assert_dom_equal(
+      '<input id="post_title" name="post[title]" type="hidden" value="Hello World" />',
       hidden_field("post", "title")
-      assert_dom_equal '<input id="post_secret" name="post[secret]" type="hidden" value="1" />',
-        hidden_field("post", "secret?")
+    )
+    assert_dom_equal(
+      '<input id="post_secret" name="post[secret]" type="hidden" value="1" />',
+      hidden_field("post", "secret?")
+    )
   end
 
   def test_hidden_field_with_escapes
     @post.title = "<b>Hello World</b>"
-    assert_dom_equal '<input id="post_title" name="post[title]" type="hidden" value="&lt;b&gt;Hello World&lt;/b&gt;" />',
+    assert_dom_equal(
+      '<input id="post_title" name="post[title]" type="hidden" value="&lt;b&gt;Hello World&lt;/b&gt;" />',
       hidden_field("post", "title")
+    )
   end
 
   def test_hidden_field_with_nil_value
     expected = '<input id="post_title" name="post[title]" type="hidden" />'
-    assert_dom_equal expected, hidden_field("post", "title", :value => nil)
+    assert_dom_equal expected, hidden_field("post", "title", value: nil)
   end
 
   def test_hidden_field_with_options
-    assert_dom_equal '<input id="post_title" name="post[title]" type="hidden" value="Something Else" />',
-      hidden_field("post", "title", :value => "Something Else")
+    assert_dom_equal(
+      '<input id="post_title" name="post[title]" type="hidden" value="Something Else" />',
+      hidden_field("post", "title", value: "Something Else")
+    )
   end
 
   def test_text_field_with_custom_type
-    assert_dom_equal '<input id="user_email" name="user[email]" type="email" />',
-      text_field("user", "email", :type => "email")
+    assert_dom_equal(
+      '<input id="user_email" name="user[email]" type="email" />',
+      text_field("user", "email", type: "email")
+    )
   end
 
   def test_check_box_is_html_safe
@@ -371,7 +421,7 @@ class FormHelperTest < ActionView::TestCase
   def test_check_box_checked_if_option_checked_is_present
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
-      check_box("post", "secret" ,{"checked"=>"checked"})
+      check_box("post", "secret", "checked"=>"checked")
     )
   end
 
@@ -410,7 +460,10 @@ class FormHelperTest < ActionView::TestCase
 
   def test_check_box_with_include_hidden_false
     @post.secret = false
-    assert_dom_equal('<input id="post_secret" name="post[secret]" type="checkbox" value="1" />', check_box("post", "secret", :include_hidden => false))
+    assert_dom_equal(
+      '<input id="post_secret" name="post[secret]" type="checkbox" value="1" />',
+      check_box("post", "secret", include_hidden: false)
+    )
   end
 
   def test_check_box_with_explicit_checked_and_unchecked_values_when_object_value_is_string
@@ -517,11 +570,11 @@ class FormHelperTest < ActionView::TestCase
     @post.comment_ids = [2,3]
     assert_dom_equal(
       '<input name="post[comment_ids][]" type="hidden" value="0" /><input id="post_comment_ids_1" name="post[comment_ids][]" type="checkbox" value="1" />',
-      check_box("post", "comment_ids", { :multiple => true }, 1)
+      check_box("post", "comment_ids", { multiple: true }, 1)
     )
     assert_dom_equal(
       '<input name="post[comment_ids][]" type="hidden" value="0" /><input checked="checked" id="post_comment_ids_3" name="post[comment_ids][]" type="checkbox" value="3" />',
-      check_box("post", "comment_ids", { :multiple => true }, 3)
+      check_box("post", "comment_ids", { multiple: true }, 3)
     )
   end
 
@@ -529,11 +582,11 @@ class FormHelperTest < ActionView::TestCase
     @post.comment_ids = [2,3]
     assert_dom_equal(
       '<input name="post[foo][comment_ids][]" type="hidden" value="0" /><input id="post_foo_comment_ids_1" name="post[foo][comment_ids][]" type="checkbox" value="1" />',
-      check_box("post", "comment_ids", { :multiple => true, :index => "foo" }, 1)
+      check_box("post", "comment_ids", { multiple: true, index: "foo" }, 1)
     )
     assert_dom_equal(
       '<input name="post[bar][comment_ids][]" type="hidden" value="0" /><input checked="checked" id="post_bar_comment_ids_3" name="post[bar][comment_ids][]" type="checkbox" value="3" />',
-      check_box("post", "comment_ids", { :multiple => true, :index => "bar" }, 3)
+      check_box("post", "comment_ids", { multiple: true, index: "bar" }, 3)
     )
 
   end
@@ -541,14 +594,14 @@ class FormHelperTest < ActionView::TestCase
   def test_checkbox_disabled_disables_hidden_field
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" disabled="disabled"/><input checked="checked" disabled="disabled" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
-      check_box("post", "secret", { :disabled => true })
+      check_box("post", "secret", { disabled: true })
     )
   end
 
   def test_checkbox_form_html5_attribute
     assert_dom_equal(
       '<input form="new_form" name="post[secret]" type="hidden" value="0" /><input checked="checked" form="new_form" id="post_secret" name="post[secret]" type="checkbox" value="1" />',
-      check_box("post", "secret", :form => "new_form")
+      check_box("post", "secret", form: "new_form")
     )
   end
 
@@ -577,7 +630,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_radio_button_respects_passed_in_id
      assert_dom_equal('<input checked="checked" id="foo" name="post[secret]" type="radio" value="1" />',
-       radio_button("post", "secret", "1", :id=>"foo")
+       radio_button("post", "secret", "1", id: "foo")
     )
   end
 
@@ -599,7 +652,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_text_area_with_escapes
-    @post.body        = "Back to <i>the</i> hill and over it again!"
+    @post.body = "Back to <i>the</i> hill and over it again!"
     assert_dom_equal(
       %{<textarea id="post_body" name="post[body]">\nBack to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>},
       text_area("post", "body")
@@ -609,12 +662,12 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_alternate_value
     assert_dom_equal(
       %{<textarea id="post_body" name="post[body]">\nTesting alternate values.</textarea>},
-      text_area("post", "body", :value => 'Testing alternate values.')
+      text_area("post", "body", value: "Testing alternate values.")
     )
   end
 
   def test_text_area_with_html_entities
-    @post.body        = "The HTML Entity for & is &amp;"
+    @post.body = "The HTML Entity for & is &amp;"
     assert_dom_equal(
       %{<textarea id="post_body" name="post[body]">\nThe HTML Entity for &amp; is &amp;amp;</textarea>},
       text_area("post", "body")
@@ -624,7 +677,7 @@ class FormHelperTest < ActionView::TestCase
   def test_text_area_with_size_option
     assert_dom_equal(
       %{<textarea cols="183" id="post_body" name="post[body]" rows="820">\nBack to the hill and over it again!</textarea>},
-      text_area("post", "body", :size => "183x820")
+      text_area("post", "body", size: "183x820")
     )
   end
 
@@ -666,7 +719,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 6, 15)
     max_value = DateTime.new(2010, 8, 15)
     step = 2
-    assert_dom_equal(expected, date_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, date_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_date_field_with_timewithzone_value
@@ -701,7 +754,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
     max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
     step = 60
-    assert_dom_equal(expected, time_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, time_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_time_field_with_timewithzone_value
@@ -736,7 +789,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
     max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
     step = 60
-    assert_dom_equal(expected, datetime_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, datetime_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_datetime_field_with_timewithzone_value
@@ -771,7 +824,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 6, 15, 20, 45, 30)
     max_value = DateTime.new(2010, 8, 15, 10, 25, 00)
     step = 60
-    assert_dom_equal(expected, datetime_local_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, datetime_local_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_datetime_local_field_with_timewithzone_value
@@ -812,7 +865,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 2, 13)
     max_value = DateTime.new(2010, 12, 23)
     step = 2
-    assert_dom_equal(expected, month_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, month_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_month_field_with_timewithzone_value
@@ -847,7 +900,7 @@ class FormHelperTest < ActionView::TestCase
     min_value = DateTime.new(2000, 2, 13)
     max_value = DateTime.new(2010, 12, 23)
     step = 2
-    assert_dom_equal(expected, week_field("post", "written_on", :min => min_value, :max => max_value, :step => step))
+    assert_dom_equal(expected, week_field("post", "written_on", min: min_value, max: max_value, step: step))
   end
 
   def test_week_field_with_timewithzone_value
@@ -871,21 +924,22 @@ class FormHelperTest < ActionView::TestCase
 
   def test_number_field
     expected = %{<input name="order[quantity]" max="9" id="order_quantity" type="number" min="1" />}
-    assert_dom_equal(expected, number_field("order", "quantity", :in => 1...10))
+    assert_dom_equal(expected, number_field("order", "quantity", in: 1...10))
     expected = %{<input name="order[quantity]" size="30" max="9" id="order_quantity" type="number" min="1" />}
-    assert_dom_equal(expected, number_field("order", "quantity", :size => 30, :in => 1...10))
+    assert_dom_equal(expected, number_field("order", "quantity", size: 30, in: 1...10))
   end
 
   def test_range_input
     expected = %{<input name="hifi[volume]" step="0.1" max="11" id="hifi_volume" type="range" min="0" />}
-    assert_dom_equal(expected, range_field("hifi", "volume", :in => 0..11, :step => 0.1))
+    assert_dom_equal(expected, range_field("hifi", "volume", in: 0..11, step: 0.1))
     expected = %{<input name="hifi[volume]" step="0.1" size="30" max="11" id="hifi_volume" type="range" min="0" />}
-    assert_dom_equal(expected, range_field("hifi", "volume", :size => 30, :in => 0..11, :step => 0.1))
+    assert_dom_equal(expected, range_field("hifi", "volume", size: 30, in: 0..11, step: 0.1))
   end
 
   def test_explicit_name
     assert_dom_equal(
-      '<input id="post_title" name="dont guess" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
+      '<input id="post_title" name="dont guess" type="text" value="Hello World" />',
+      text_field("post", "title", "name" => "dont guess")
     )
     assert_dom_equal(
       %{<textarea id="post_body" name="really!">\nBack to the hill and over it again!</textarea>},
@@ -895,17 +949,24 @@ class FormHelperTest < ActionView::TestCase
       '<input name="i mean it" type="hidden" value="0" /><input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" />',
       check_box("post", "secret", "name" => "i mean it")
     )
-    assert_dom_equal text_field("post", "title", "name" => "dont guess"),
-                 text_field("post", "title", :name => "dont guess")
-    assert_dom_equal text_area("post", "body", "name" => "really!"),
-                 text_area("post", "body", :name => "really!")
-    assert_dom_equal check_box("post", "secret", "name" => "i mean it"),
-                 check_box("post", "secret", :name => "i mean it")
+    assert_dom_equal(
+      text_field("post", "title", "name" => "dont guess"),
+      text_field("post", "title", name: "dont guess")
+    )
+    assert_dom_equal(
+      text_area("post", "body", "name" => "really!"),
+      text_area("post", "body", name: "really!")
+    )
+    assert_dom_equal(
+      check_box("post", "secret", "name" => "i mean it"),
+      check_box("post", "secret", name: "i mean it")
+    )
   end
 
   def test_explicit_id
     assert_dom_equal(
-      '<input id="dont guess" name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
+      '<input id="dont guess" name="post[title]" type="text" value="Hello World" />',
+      text_field("post", "title", "id" => "dont guess")
     )
     assert_dom_equal(
       %{<textarea id="really!" name="post[body]">\nBack to the hill and over it again!</textarea>},
@@ -915,17 +976,24 @@ class FormHelperTest < ActionView::TestCase
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" />',
       check_box("post", "secret", "id" => "i mean it")
     )
-    assert_dom_equal text_field("post", "title", "id" => "dont guess"),
-                 text_field("post", "title", :id => "dont guess")
-    assert_dom_equal text_area("post", "body", "id" => "really!"),
-                 text_area("post", "body", :id => "really!")
-    assert_dom_equal check_box("post", "secret", "id" => "i mean it"),
-                 check_box("post", "secret", :id => "i mean it")
+    assert_dom_equal(
+      text_field("post", "title", "id" => "dont guess"),
+      text_field("post", "title", id: "dont guess")
+    )
+    assert_dom_equal(
+      text_area("post", "body", "id" => "really!"),
+      text_area("post", "body", id: "really!")
+    )
+    assert_dom_equal(
+      check_box("post", "secret", "id" => "i mean it"),
+      check_box("post", "secret", id: "i mean it")
+    )
   end
 
   def test_nil_id
     assert_dom_equal(
-      '<input name="post[title]" type="text" value="Hello World" />', text_field("post", "title", "id" => nil)
+      '<input name="post[title]" type="text" value="Hello World" />',
+      text_field("post", "title", "id" => nil)
     )
     assert_dom_equal(
       %{<textarea name="post[body]">\nBack to the hill and over it again!</textarea>},
@@ -943,14 +1011,22 @@ class FormHelperTest < ActionView::TestCase
       '<select name="post[secret]"></select>',
       select("post", "secret", [], {}, "id" => nil)
     )
-    assert_dom_equal text_field("post", "title", "id" => nil),
-                 text_field("post", "title", :id => nil)
-    assert_dom_equal text_area("post", "body", "id" => nil),
-                 text_area("post", "body", :id => nil)
-    assert_dom_equal check_box("post", "secret", "id" => nil),
-                 check_box("post", "secret", :id => nil)
-    assert_dom_equal radio_button("post", "secret", "0", "id" => nil),
-                 radio_button("post", "secret", "0", :id => nil)
+    assert_dom_equal(
+      text_field("post", "title", "id" => nil),
+      text_field("post", "title", id: nil)
+    )
+    assert_dom_equal(
+      text_area("post", "body", "id" => nil),
+      text_area("post", "body", id: nil)
+    )
+    assert_dom_equal(
+      check_box("post", "secret", "id" => nil),
+      check_box("post", "secret", id: nil)
+    )
+    assert_dom_equal(
+      radio_button("post", "secret", "0", "id" => nil),
+      radio_button("post", "secret", "0", id: nil)
+    )
   end
 
   def test_index
@@ -995,40 +1071,42 @@ class FormHelperTest < ActionView::TestCase
     )
     assert_dom_equal(
       text_field("post", "title", "index" => 5, 'id' => nil),
-      text_field("post", "title", :index => 5, :id => nil)
+      text_field("post", "title", index: 5, id: nil)
     )
     assert_dom_equal(
       text_area("post", "body", "index" => 5, 'id' => nil),
-      text_area("post", "body", :index => 5, :id => nil)
+      text_area("post", "body", index: 5, id: nil)
     )
     assert_dom_equal(
       check_box("post", "secret", "index" => 5, 'id' => nil),
-      check_box("post", "secret", :index => 5, :id => nil)
+      check_box("post", "secret", index: 5, id: nil)
     )
   end
 
   def test_auto_index
     pid = 123
     assert_dom_equal(
-      "<label for=\"post_#{pid}_title\">Title</label>",
+      %{<label for="post_#{pid}_title">Title</label>},
       label("post[]", "title")
     )
     assert_dom_equal(
-      "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
+      %{<input id="post_#{pid}_title" name="post[#{pid}][title]" type="text" value="Hello World" />},
+      text_field("post[]","title")
     )
     assert_dom_equal(
-      "<textarea id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
+      %{<textarea id="post_#{pid}_body" name="post[#{pid}][body]">\nBack to the hill and over it again!</textarea>},
       text_area("post[]", "body")
     )
     assert_dom_equal(
-      "<input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" /><input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" />",
+      %{<input name="post[#{pid}][secret]" type="hidden" value="0" /><input checked="checked" id="post_#{pid}_secret" name="post[#{pid}][secret]" type="checkbox" value="1" />},
       check_box("post[]", "secret")
     )
    assert_dom_equal(
-      "<input checked=\"checked\" id=\"post_#{pid}_title_hello_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Hello World\" />",
+      %{<input checked="checked" id="post_#{pid}_title_hello_world" name="post[#{pid}][title]" type="radio" value="Hello World" />},
       radio_button("post[]", "title", "Hello World")
     )
-    assert_dom_equal("<input id=\"post_#{pid}_title_goodbye_world\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Goodbye World\" />",
+    assert_dom_equal(
+      %{<input id="post_#{pid}_title_goodbye_world" name="post[#{pid}][title]" type="radio" value="Goodbye World" />},
       radio_button("post[]", "title", "Goodbye World")
     )
   end
@@ -1036,48 +1114,49 @@ class FormHelperTest < ActionView::TestCase
   def test_auto_index_with_nil_id
     pid = 123
     assert_dom_equal(
-      "<input name=\"post[#{pid}][title]\" type=\"text\" value=\"Hello World\" />",
-      text_field("post[]","title", :id => nil)
+      %{<input name="post[#{pid}][title]" type="text" value="Hello World" />},
+      text_field("post[]", "title", id: nil)
     )
     assert_dom_equal(
-      "<textarea name=\"post[#{pid}][body]\">\nBack to the hill and over it again!</textarea>",
-      text_area("post[]", "body", :id => nil)
+      %{<textarea name="post[#{pid}][body]">\nBack to the hill and over it again!</textarea>},
+      text_area("post[]", "body", id: nil)
     )
     assert_dom_equal(
-      "<input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" /><input checked=\"checked\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" />",
-      check_box("post[]", "secret", :id => nil)
+      %{<input name="post[#{pid}][secret]" type="hidden" value="0" /><input checked="checked" name="post[#{pid}][secret]" type="checkbox" value="1" />},
+      check_box("post[]", "secret", id: nil)
     )
    assert_dom_equal(
-"<input checked=\"checked\" name=\"post[#{pid}][title]\" type=\"radio\" value=\"Hello World\" />",
-      radio_button("post[]", "title", "Hello World", :id => nil)
+     %{<input checked="checked" name="post[#{pid}][title]" type="radio" value="Hello World" />},
+      radio_button("post[]", "title", "Hello World", id: nil)
     )
-    assert_dom_equal("<input name=\"post[#{pid}][title]\" type=\"radio\" value=\"Goodbye World\" />",
-      radio_button("post[]", "title", "Goodbye World", :id => nil)
+    assert_dom_equal(
+      %{<input name="post[#{pid}][title]" type="radio" value="Goodbye World" />},
+      radio_button("post[]", "title", "Goodbye World", id: nil)
     )
   end
 
   def test_form_for_requires_block
     assert_raises(ArgumentError) do
-      form_for(:post, @post, :html => { :id => 'create-post' })
+      form_for(:post, @post, html: { id: 'create-post' })
     end
   end
 
   def test_form_for_requires_arguments
     error = assert_raises(ArgumentError) do
-      form_for(nil, :html => { :id => 'create-post' }) do
+      form_for(nil, html: { id: 'create-post' }) do
       end
     end
     assert_equal "First argument in form cannot contain nil or be empty", error.message
 
     error = assert_raises(ArgumentError) do
-      form_for([nil, nil], :html => { :id => 'create-post' }) do
+      form_for([nil, nil], html: { id: 'create-post' }) do
       end
     end
     assert_equal "First argument in form cannot contain nil or be empty", error.message
   end
 
   def test_form_for
-    form_for(@post, :html => { :id => 'create-post' }) do |f|
+    form_for(@post, html: { id: 'create-post' }) do |f|
       concat f.label(:title) { "The Title" }
       concat f.text_field(:title)
       concat f.text_area(:body)
@@ -1089,7 +1168,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch') do
+    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch") do
       "<label for='post_title'>The Title</label>" +
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
@@ -1110,7 +1189,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.collection_radio_buttons(:active, [true, false], :to_s, :to_s)
     end
 
-    expected = whole_form("/posts", "new_post" , "new_post") do
+    expected = whole_form("/posts", "new_post", "new_post") do
       "<input id='post_active_true' name='post[active]' type='radio' value='true' />" +
       "<label for='post_active_true'>true</label>" +
       "<input checked='checked' id='post_active_false' name='post[active]' type='radio' value='false' />" +
@@ -1123,6 +1202,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_collection_radio_buttons_with_custom_builder_block
     post = Post.new
     def post.active; false; end
+
     form_for(post) do |f|
       rendered_radio_buttons = f.collection_radio_buttons(:active, [true, false], :to_s, :to_s) do |b|
         b.label { b.radio_button + b.text }
@@ -1130,7 +1210,7 @@ class FormHelperTest < ActionView::TestCase
       concat rendered_radio_buttons
     end
 
-    expected = whole_form("/posts", "new_post" , "new_post") do
+    expected = whole_form("/posts", "new_post", "new_post") do
       "<label for='post_active_true'>"+
       "<input id='post_active_true' name='post[active]' type='radio' value='true' />" +
       "true</label>" +
@@ -1171,12 +1251,12 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_collection_check_boxes
     post = Post.new
     def post.tag_ids; [1, 3]; end
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     form_for(post) do |f|
       concat f.collection_check_boxes(:tag_ids, collection, :first, :last)
     end
 
-    expected = whole_form("/posts", "new_post" , "new_post") do
+    expected = whole_form("/posts", "new_post", "new_post") do
       "<input checked='checked' id='post_tag_ids_1' name='post[tag_ids][]' type='checkbox' value='1' />" +
       "<label for='post_tag_ids_1'>Tag 1</label>" +
       "<input id='post_tag_ids_2' name='post[tag_ids][]' type='checkbox' value='2' />" +
@@ -1192,7 +1272,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_collection_check_boxes_with_custom_builder_block
     post = Post.new
     def post.tag_ids; [1, 3]; end
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
     form_for(post) do |f|
       rendered_check_boxes = f.collection_check_boxes(:tag_ids, collection, :first, :last) do |b|
         b.label { b.check_box + b.text }
@@ -1200,7 +1280,7 @@ class FormHelperTest < ActionView::TestCase
       concat rendered_check_boxes
     end
 
-    expected = whole_form("/posts", "new_post" , "new_post") do
+    expected = whole_form("/posts", "new_post", "new_post") do
       "<label for='post_tag_ids_1'>" +
       "<input checked='checked' id='post_tag_ids_1' name='post[tag_ids][]' type='checkbox' value='1' />" +
       "Tag 1</label>" +
@@ -1220,7 +1300,7 @@ class FormHelperTest < ActionView::TestCase
     post = Post.new
     def post.tag_ids; [1, 3]; end
     def post.id; 1; end
-    collection = (1..3).map{|i| [i, "Tag #{i}"] }
+    collection = (1..3).map { |i| [i, "Tag #{i}"] }
 
     form_for(post) do |f|
       rendered_check_boxes = f.collection_check_boxes(:tag_ids, collection, :first, :last) do |b|
@@ -1250,11 +1330,11 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_file_field_generate_multipart
     Post.send :attr_accessor, :file
 
-    form_for(@post, :html => { :id => 'create-post' }) do |f|
+    form_for(@post, html: { id: 'create-post' }) do |f|
       concat f.file_field(:file)
     end
 
-    expected = whole_form("/posts/123", "create-post" , "edit_post", :method => 'patch', :multipart => true) do
+    expected = whole_form("/posts/123", "create-post", "edit_post", method: "patch", multipart: true) do
       "<input name='post[file]' type='file' id='post_file' />"
     end
 
@@ -1270,7 +1350,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form("/posts/123", "edit_post_123" , "edit_post", :method => 'patch', :multipart => true) do
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch", multipart: true) do
       "<input name='post[comment][file]' type='file' id='post_comment_file' />"
     end
 
@@ -1278,11 +1358,11 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_format
-    form_for(@post, :format => :json, :html => { :id => "edit_post_123", :class => "edit_post" }) do |f|
+    form_for(@post, format: :json, html: { id: "edit_post_123", class: "edit_post" }) do |f|
       concat f.label(:title)
     end
 
-    expected = whole_form("/posts/123.json", "edit_post_123" , "edit_post", :method => 'patch') do
+    expected = whole_form("/posts/123.json", "edit_post_123", "edit_post", method: 'patch') do
       "<label for='post_title'>Title</label>"
     end
 
@@ -1297,7 +1377,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit('Edit post')
     end
 
-    expected = whole_form("/posts/44", "edit_post_44" , "edit_post", :method => 'patch') do
+    expected = whole_form("/posts/44", "edit_post_44", "edit_post", method: "patch") do
       "<input name='post[title]' type='text' id='post_title' value='And his name will be forty and four.' />" +
       "<input name='commit' type='submit' value='Edit post' />"
     end
@@ -1306,15 +1386,15 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_symbol_object_name
-    form_for(@post, :as => "other_name", :html => { :id => 'create-post' }) do |f|
-      concat f.label(:title, :class => 'post_title')
+    form_for(@post, as: "other_name", html: { id: "create-post" }) do |f|
+      concat f.label(:title, class: 'post_title')
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
       concat f.submit('Create post')
     end
 
-    expected =  whole_form("/posts/123", "create-post", "edit_other_name", :method => 'patch') do
+    expected =  whole_form("/posts/123", "create-post", "edit_other_name", method: "patch") do
       "<label for='other_name_title' class='post_title'>Title</label>" +
       "<input name='other_name[title]' id='other_name_title' value='Hello World' type='text' />" +
       "<textarea name='other_name[body]' id='other_name_body'>\nBack to the hill and over it again!</textarea>" +
@@ -1327,13 +1407,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_method_as_part_of_html_options
-    form_for(@post, :url => '/', :html => { :id => 'create-post', :method => :delete }) do |f|
+    form_for(@post, url: '/', html: { id: 'create-post', method: :delete }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", "delete") do
+    expected =  whole_form("/", "create-post", "edit_post", method: "delete") do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1344,13 +1424,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_method
-    form_for(@post, :url => '/', :method => :delete, :html => { :id => 'create-post' }) do |f|
+    form_for(@post, url: '/', method: :delete, html: { id: 'create-post' }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", "delete") do
+    expected =  whole_form("/", "create-post", "edit_post", method: "delete") do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1363,11 +1443,11 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_search_field
     # Test case for bug which would emit an "object" attribute
     # when used with form_for using a search_field form helper
-    form_for(Post.new, :url => "/search", :html => { :id => 'search-post', :method => :get}) do |f|
+    form_for(Post.new, url: "/search", html: { id: "search-post", method: :get }) do |f|
       concat f.search_field(:title)
     end
 
-    expected =  whole_form("/search", "search-post", "new_post", "get") do
+    expected =  whole_form("/search", "search-post", "new_post", method: "get") do
       "<input name='post[title]' type='search' id='post_title' />"
     end
 
@@ -1375,13 +1455,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_remote
-    form_for(@post, :url => '/', :remote => true, :html => { :id => 'create-post', :method => :patch}) do |f|
+    form_for(@post, url: '/', remote: true, html: { id: 'create-post', method: :patch }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
+    expected =  whole_form("/", "create-post", "edit_post", method: "patch", remote: true) do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1392,13 +1472,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_remote_in_html
-    form_for(@post, :url => '/', :html => { :remote => true, :id => 'create-post', :method => :patch }) do |f|
+    form_for(@post, url: '/', html: { remote: true, id: 'create-post', method: :patch }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/", "create-post", "edit_post", :method => 'patch', :remote => true) do
+    expected =  whole_form("/", "create-post", "edit_post", method: "patch", remote: true) do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1411,13 +1491,13 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_remote_without_html
     @post.persisted = false
     @post.stubs(:to_key).returns(nil)
-    form_for(@post, :remote => true) do |f|
+    form_for(@post, remote: true) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected =  whole_form("/posts", 'new_post', 'new_post', :remote => true) do
+    expected =  whole_form("/posts", "new_post", "new_post", remote: true) do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1428,7 +1508,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_without_object
-    form_for(:post, :html => { :id => 'create-post' }) do |f|
+    form_for(:post, html: { id: 'create-post' }) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -1445,14 +1525,14 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_index
-    form_for(@post, :as => "post[]") do |f|
+    form_for(@post, as: "post[]") do |f|
       concat f.label(:title)
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<label for='post_123_title'>Title</label>" +
       "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body'>\nBack to the hill and over it again!</textarea>" +
@@ -1464,13 +1544,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_nil_index_option_override
-    form_for(@post, :as => "post[]", :index => nil) do |f|
+    form_for(@post, as: "post[]", index: nil) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<input name='post[][title]' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
@@ -1482,12 +1562,12 @@ class FormHelperTest < ActionView::TestCase
 
   def test_form_for_label_error_wrapping
     form_for(@post) do |f|
-      concat f.label(:author_name, :class => 'label')
+      concat f.label(:author_name, class: 'label')
       concat f.text_field(:author_name)
       concat f.submit('Create post')
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
       "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
       "<input name='commit' type='submit' value='Create post' />"
@@ -1500,12 +1580,12 @@ class FormHelperTest < ActionView::TestCase
     post = remove_instance_variable :@post
 
     form_for(post) do |f|
-      concat f.label(:author_name, :class => 'label')
+      concat f.label(:author_name, class: 'label')
       concat f.text_field(:author_name)
       concat f.submit('Create post')
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<div class='field_with_errors'><label for='post_author_name' class='label'>Author name</label></div>" +
       "<div class='field_with_errors'><input name='post[author_name]' type='text' id='post_author_name' value='' /></div>" +
       "<input name='commit' type='submit' value='Create post' />"
@@ -1516,11 +1596,11 @@ class FormHelperTest < ActionView::TestCase
 
   def test_form_for_label_error_wrapping_block_and_non_block_versions
     form_for(@post) do |f|
-      concat f.label(:author_name, 'Name', :class => 'label')
-      concat f.label(:author_name, :class => 'label') { 'Name' }
+      concat f.label(:author_name, 'Name', class: 'label')
+      concat f.label(:author_name, class: 'label') { 'Name' }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123' , 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>" +
       "<div class='field_with_errors'><label for='post_author_name' class='label'>Name</label></div>"
     end
@@ -1529,13 +1609,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_namespace
-    form_for(@post, :namespace => 'namespace') do |f|
+    form_for(@post, namespace: 'namespace') do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
@@ -1546,7 +1626,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_namespace_with_date_select
-    form_for(@post, :namespace => 'namespace') do |f|
+    form_for(@post, namespace: 'namespace') do |f|
       concat f.date_select(:written_on)
     end
 
@@ -1554,12 +1634,12 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_namespace_with_label
-    form_for(@post, :namespace => 'namespace') do |f|
+    form_for(@post, namespace: 'namespace') do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
 
-    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', method: 'patch') do
       "<label for='namespace_post_title'>Title</label>" +
       "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />"
     end
@@ -1568,24 +1648,24 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_two_form_for_with_namespace
-    form_for(@post, :namespace => 'namespace_1') do |f|
+    form_for(@post, namespace: 'namespace_1') do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
 
-    expected_1 = whole_form('/posts/123', 'namespace_1_edit_post_123', 'edit_post', 'patch') do
+    expected_1 = whole_form('/posts/123', 'namespace_1_edit_post_123', 'edit_post', method: 'patch') do
       "<label for='namespace_1_post_title'>Title</label>" +
       "<input name='post[title]' type='text' id='namespace_1_post_title' value='Hello World' />"
     end
 
     assert_dom_equal expected_1, output_buffer
 
-    form_for(@post, :namespace => 'namespace_2') do |f|
+    form_for(@post, namespace: 'namespace_2') do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
 
-    expected_2 = whole_form('/posts/123', 'namespace_2_edit_post_123', 'edit_post', 'patch') do
+    expected_2 = whole_form('/posts/123', 'namespace_2_edit_post_123', 'edit_post', method: 'patch') do
       "<label for='namespace_2_post_title'>Title</label>" +
       "<input name='post[title]' type='text' id='namespace_2_post_title' value='Hello World' />"
     end
@@ -1595,7 +1675,7 @@ class FormHelperTest < ActionView::TestCase
 
   def test_fields_for_with_namespace
     @comment.body = 'Hello World'
-    form_for(@post, :namespace => 'namespace') do |f|
+    form_for(@post, namespace: 'namespace') do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.fields_for(@comment) { |c|
@@ -1603,7 +1683,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'namespace_edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[title]' type='text' id='namespace_post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='namespace_post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[comment][body]' type='text' id='namespace_post_comment_body' value='Hello World' />"
@@ -1637,7 +1717,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='commit' type='submit' value='Confirm Post changes' />"
     end
 
@@ -1650,7 +1730,7 @@ class FormHelperTest < ActionView::TestCase
     old_locale, I18n.locale = I18n.locale, :submit
 
     form_for(:post) do |f|
-      concat f.submit :class => "extra"
+      concat f.submit class: "extra"
     end
 
     expected = whole_form do
@@ -1665,11 +1745,11 @@ class FormHelperTest < ActionView::TestCase
   def test_submit_with_object_and_nested_lookup
     old_locale, I18n.locale = I18n.locale, :submit
 
-    form_for(@post, :as => :another_post) do |f|
+    form_for(@post, as: :another_post) do |f|
       concat f.submit
     end
 
-    expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_another_post', 'edit_another_post', method: 'patch') do
       "<input name='commit' type='submit' value='Update your Post' />"
     end
 
@@ -1686,7 +1766,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[comment][body]' type='text' id='post_comment_body' value='Hello World' />"
     end
 
@@ -1694,14 +1774,14 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_nested_collections
-    form_for(@post, :as => 'post[]') do |f|
+    form_for(@post, as: 'post[]') do |f|
       concat f.text_field(:title)
       concat f.fields_for('comment[]', @comment) { |c|
         concat c.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<input name='post[123][title]' type='text' id='post_123_title' value='Hello World' />" +
       "<input name='post[123][comment][][name]' type='text' id='post_123_comment__name' value='new comment' />"
     end
@@ -1710,14 +1790,14 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_index_and_parent_fields
-    form_for(@post, :index => 1) do |c|
+    form_for(@post, index: 1) do |c|
       concat c.text_field(:title)
-      concat c.fields_for('comment', @comment, :index => 1) { |r|
+      concat c.fields_for('comment', @comment, index: 1) { |r|
         concat r.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[1][title]' type='text' id='post_1_title' value='Hello World' />" +
       "<input name='post[1][comment][1][name]' type='text' id='post_1_comment_1_name' value='new comment' />"
     end
@@ -1726,13 +1806,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_index_and_nested_fields_for
-    output_buffer = form_for(@post, :index => 1) do |f|
+    output_buffer = form_for(@post, index: 1) do |f|
       concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[1][comment][title]' type='text' id='post_1_comment_title' value='Hello World' />"
     end
 
@@ -1740,13 +1820,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_index_on_both
-    form_for(@post, :index => 1) do |f|
-      concat f.fields_for(:comment, @post, :index => 5) { |c|
+    form_for(@post, index: 1) do |f|
+      concat f.fields_for(:comment, @post, index: 5) { |c|
         concat c.text_field(:title)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[1][comment][5][title]' type='text' id='post_1_comment_5_title' value='Hello World' />"
     end
 
@@ -1754,13 +1834,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_auto_index
-    form_for(@post, :as => "post[]") do |f|
+    form_for(@post, as: "post[]") do |f|
       concat f.fields_for(:comment, @post) { |c|
         concat c.text_field(:title)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<input name='post[123][comment][title]' type='text' id='post_123_comment_title' value='Hello World' />"
     end
 
@@ -1769,12 +1849,12 @@ class FormHelperTest < ActionView::TestCase
 
   def test_nested_fields_for_with_index_radio_button
     form_for(@post) do |f|
-      concat f.fields_for(:comment, @post, :index => 5) { |c|
+      concat f.fields_for(:comment, @post, index: 5) { |c|
         concat c.radio_button(:title, "hello")
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[comment][5][title]' type='radio' id='post_comment_5_title_hello' value='hello' />"
     end
 
@@ -1782,13 +1862,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_auto_index_on_both
-    form_for(@post, :as => "post[]") do |f|
+    form_for(@post, as: "post[]") do |f|
       concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<input name='post[123][comment][123][title]' type='text' id='post_123_comment_123_title' value='Hello World' />"
     end
 
@@ -1796,21 +1876,21 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_nested_fields_for_with_index_and_auto_index
-    output_buffer = form_for(@post, :as => "post[]") do |f|
-      concat f.fields_for(:comment, @post, :index => 5) { |c|
+    output_buffer = form_for(@post, as: "post[]") do |f|
+      concat f.fields_for(:comment, @post, index: 5) { |c|
         concat c.text_field(:title)
       }
     end
 
-    output_buffer << form_for(@post, :as => :post, :index => 1) do |f|
+    output_buffer << form_for(@post, as: :post, index: 1) do |f|
       concat f.fields_for("comment[]", @post) { |c|
         concat c.text_field(:title)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post[]', 'edit_post[]', method: 'patch') do
       "<input name='post[123][comment][5][title]' type='text' id='post_123_comment_5_title' value='Hello World' />"
-    end + whole_form('/posts/123', 'edit_post', 'edit_post', 'patch') do
+    end + whole_form('/posts/123', 'edit_post', 'edit_post', method: 'patch') do
       "<input name='post[1][comment][123][title]' type='text' id='post_1_comment_123_title' value='Hello World' />"
     end
 
@@ -1827,7 +1907,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
         '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="new author" />'
     end
@@ -1854,7 +1934,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-   expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+   expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
      '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
      '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
      '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
@@ -1873,7 +1953,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
@@ -1887,12 +1967,12 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(@post) do |f|
       concat f.text_field(:title)
-      concat f.fields_for(:author, :include_id => false) { |af|
+      concat f.fields_for(:author, include_id: false) { |af|
         af.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
@@ -1903,14 +1983,14 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association_with_disabled_hidden_id_inherited
     @post.author = Author.new(321)
 
-    form_for(@post, :include_id => false) do |f|
+    form_for(@post, include_id: false) do |f|
       concat f.text_field(:title)
       concat f.fields_for(:author) { |af|
         af.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
     end
@@ -1921,14 +2001,14 @@ class FormHelperTest < ActionView::TestCase
   def test_nested_fields_for_with_an_existing_record_on_a_nested_attributes_one_to_one_association_with_disabled_hidden_id_override
     @post.author = Author.new(321)
 
-    form_for(@post, :include_id => false) do |f|
+    form_for(@post, include_id: false) do |f|
       concat f.text_field(:title)
-      concat f.fields_for(:author, :include_id => true) { |af|
+      concat f.fields_for(:author, include_id: true) { |af|
         af.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
@@ -1948,7 +2028,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />'
@@ -1969,7 +2049,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
@@ -1990,13 +2070,13 @@ class FormHelperTest < ActionView::TestCase
         concat af.text_field(:name)
       }
       @post.comments.each do |comment|
-        concat f.fields_for(:comments, comment, :include_id => false) { |cf|
+        concat f.fields_for(:comments, comment, include_id: false) { |cf|
           concat cf.text_field(:name)
         }
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
@@ -2011,7 +2091,7 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
     @post.author = Author.new(321)
 
-    form_for(@post, :include_id => false) do |f|
+    form_for(@post, include_id: false) do |f|
       concat f.text_field(:title)
       concat f.fields_for(:author) { |af|
         concat af.text_field(:name)
@@ -2023,7 +2103,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
@@ -2037,9 +2117,9 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = Array.new(2) { |id| Comment.new(id + 1) }
     @post.author = Author.new(321)
 
-    form_for(@post, :include_id => false) do |f|
+    form_for(@post, include_id: false) do |f|
       concat f.text_field(:title)
-      concat f.fields_for(:author, :include_id => true) { |af|
+      concat f.fields_for(:author, include_id: true) { |af|
         concat af.text_field(:name)
       }
       @post.comments.each do |comment|
@@ -2049,7 +2129,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="author #321" />' +
       '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
@@ -2072,7 +2152,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
@@ -2096,7 +2176,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
@@ -2119,7 +2199,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="new comment" />' +
       '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" type="text" value="new comment" />'
@@ -2140,7 +2220,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
@@ -2158,7 +2238,7 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />'
     end
 
@@ -2175,7 +2255,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
@@ -2196,7 +2276,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
@@ -2218,7 +2298,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #1" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
@@ -2241,7 +2321,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input name="post[title]" type="text" id="post_title" value="Hello World" />' +
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
@@ -2256,12 +2336,12 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = []
 
     form_for(@post) do |f|
-      concat f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
+      concat f.fields_for(:comments, Comment.new(321), child_index: 'abc') { |cf|
         concat cf.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />'
     end
@@ -2279,12 +2359,12 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = FakeAssociationProxy.new
 
     form_for(@post) do |f|
-      concat f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
+      concat f.fields_for(:comments, Comment.new(321), child_index: 'abc') { |cf|
         concat cf.text_field(:name)
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />'
     end
@@ -2336,7 +2416,7 @@ class FormHelperTest < ActionView::TestCase
     @post.comments = []
 
     form_for(@post) do |f|
-      f.fields_for(:comments, Comment.new(321), :child_index => 'abc') { |cf|
+      f.fields_for(:comments, Comment.new(321), child_index: 'abc') { |cf|
         assert_equal cf.index, 'abc'
       }
     end
@@ -2370,7 +2450,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" type="text" value="comment #321" />' +
       '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" type="text" value="commentrelevance #314" />' +
       '<input id="post_comments_attributes_0_relevances_attributes_0_id" name="post[comments_attributes][0][relevances_attributes][0][id]" type="hidden" value="314" />' +
@@ -2397,7 +2477,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       '<input id="post_author_attributes_name" name="post[author_attributes][name]" type="text" value="hash backed author" />'
     end
 
@@ -2437,7 +2517,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_nil_index_option_override
-    output_buffer = fields_for("post[]", @post, :index => nil) do |f|
+    output_buffer = fields_for("post[]", @post, index: nil) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -2453,7 +2533,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_index_option_override
-    output_buffer = fields_for("post[]", @post, :index => "abc") do |f|
+    output_buffer = fields_for("post[]", @post, index: "abc") do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -2512,7 +2592,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_object_with_bracketed_name_and_index
-    output_buffer = fields_for("author[post]", @post, :index => 1) do |f|
+    output_buffer = fields_for("author[post]", @post, index: 1) do |f|
       concat f.label(:title)
       concat f.text_field(:title)
     end
@@ -2527,7 +2607,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_and_fields_for
-    form_for(@post, :as => :post, :html => { :id => 'create-post' }) do |post_form|
+    form_for(@post, as: :post, html: { id: 'create-post' }) do |post_form|
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
@@ -2536,7 +2616,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', method: 'patch') do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
@@ -2547,7 +2627,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_and_fields_for_with_object
-    form_for(@post, :as => :post, :html => { :id => 'create-post' }) do |post_form|
+    form_for(@post, as: :post, html: { id: 'create-post' }) do |post_form|
       concat post_form.text_field(:title)
       concat post_form.text_area(:body)
 
@@ -2556,7 +2636,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'create-post', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'create-post', 'edit_post', method: 'patch') do
       "<input name='post[title]' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea>" +
       "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' />"
@@ -2572,7 +2652,7 @@ class FormHelperTest < ActionView::TestCase
       }
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<input name='post[category][name]' type='text' id='post_category_name' />"
     end
 
@@ -2590,13 +2670,13 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_labelled_builder
-    form_for(@post, :builder => LabelledFormBuilder) do |f|
+    form_for(@post, builder: LabelledFormBuilder) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
@@ -2615,7 +2695,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body'>\nBack to the hill and over it again!</textarea><br/>" +
       "<label for='secret'>Secret:</label> <input name='post[secret]' type='hidden' value='0' /><input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' /><br/>"
@@ -2634,7 +2714,7 @@ class FormHelperTest < ActionView::TestCase
       concat f.text_field(:title)
     end
 
-    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', :method => 'patch') do
+    expected = whole_form('/posts/123', 'edit_post_123', 'edit_post', method: 'patch') do
       "<label for='title'>Title:</label> <input name='post[title]' type='text' id='post_title' value='Hello World' /><br/>"
     end
 
@@ -2644,7 +2724,7 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_fields_for_with_labelled_builder
-    output_buffer = fields_for(:post, @post, :builder => LabelledFormBuilder) do |f|
+    output_buffer = fields_for(:post, @post, builder: LabelledFormBuilder) do |f|
       concat f.text_field(:title)
       concat f.text_area(:body)
       concat f.check_box(:secret)
@@ -2661,7 +2741,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_labelled_builder_with_nested_fields_for_without_options_hash
     klass = nil
 
-    form_for(@post, :builder => LabelledFormBuilder) do |f|
+    form_for(@post, builder: LabelledFormBuilder) do |f|
       f.fields_for(:comments, Comment.new) do |nested_fields|
         klass = nested_fields.class
         ''
@@ -2674,8 +2754,8 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_labelled_builder_with_nested_fields_for_with_options_hash
     klass = nil
 
-    form_for(@post, :builder => LabelledFormBuilder) do |f|
-      f.fields_for(:comments, Comment.new, :index => 'foo') do |nested_fields|
+    form_for(@post, builder: LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, index: 'foo') do |nested_fields|
         klass = nested_fields.class
         ''
       end
@@ -2687,7 +2767,7 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_labelled_builder_path
     path = nil
 
-    form_for(@post, :builder => LabelledFormBuilder) do |f|
+    form_for(@post, builder: LabelledFormBuilder) do |f|
       path = f.to_partial_path
       ''
     end
@@ -2700,8 +2780,8 @@ class FormHelperTest < ActionView::TestCase
   def test_form_for_with_labelled_builder_with_nested_fields_for_with_custom_builder
     klass = nil
 
-    form_for(@post, :builder => LabelledFormBuilder) do |f|
-      f.fields_for(:comments, Comment.new, :builder => LabelledFormBuilderSubclass) do |nested_fields|
+    form_for(@post, builder: LabelledFormBuilder) do |f|
+      f.fields_for(:comments, Comment.new, builder: LabelledFormBuilderSubclass) do |nested_fields|
         klass = nested_fields.class
         ''
       end
@@ -2711,36 +2791,36 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_html_options_adds_options_to_form_tag
-    form_for(@post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
-    expected = whole_form("/posts/123", "some_form", "some_class", 'patch')
+    form_for(@post, html: { id: 'some_form', class: 'some_class' }) do |f| end
+    expected = whole_form("/posts/123", "some_form", "some_class", method: "patch")
 
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_string_url_option
-    form_for(@post, :url => 'http://www.otherdomain.com') do |f| end
+    form_for(@post, url: 'http://www.otherdomain.com') do |f| end
 
-    assert_equal whole_form("http://www.otherdomain.com", 'edit_post_123', 'edit_post', 'patch'), output_buffer
+    assert_equal whole_form("http://www.otherdomain.com", "edit_post_123", "edit_post", method: "patch"), output_buffer
   end
 
   def test_form_for_with_hash_url_option
-    form_for(@post, :url => {:controller => 'controller', :action => 'action'}) do |f| end
+    form_for(@post, url: { controller: 'controller', action: 'action' }) do |f| end
 
     assert_equal 'controller', @url_for_options[:controller]
     assert_equal 'action', @url_for_options[:action]
   end
 
   def test_form_for_with_record_url_option
-    form_for(@post, :url => @post) do |f| end
+    form_for(@post, url: @post) do |f| end
 
-    expected = whole_form("/posts/123", 'edit_post_123', 'edit_post', 'patch')
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch")
     assert_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object
     form_for(@post) do |f| end
 
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", 'patch')
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch")
     assert_equal expected, output_buffer
   end
 
@@ -2759,7 +2839,7 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([@post, @comment]) {}
 
-    expected = whole_form(post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", 'patch')
+    expected = whole_form(post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", method: "patch")
     assert_dom_equal expected, output_buffer
   end
 
@@ -2774,7 +2854,7 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([:admin, @post, @comment]) {}
 
-    expected = whole_form(admin_post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", 'patch')
+    expected = whole_form(admin_post_comment_path(@post, @comment), "edit_comment_1", "edit_comment", method: "patch")
     assert_dom_equal expected, output_buffer
   end
 
@@ -2786,15 +2866,15 @@ class FormHelperTest < ActionView::TestCase
   end
 
   def test_form_for_with_existing_object_and_custom_url
-    form_for(@post, :url => "/super_posts") do |f| end
+    form_for(@post, url: "/super_posts") do |f| end
 
-    expected = whole_form("/super_posts", "edit_post_123", "edit_post", 'patch')
+    expected = whole_form("/super_posts", "edit_post_123", "edit_post", method: "patch")
     assert_equal expected, output_buffer
   end
 
   def test_form_for_with_default_method_as_patch
     form_for(@post) {}
-    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "patch")
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", method: "patch")
     assert_dom_equal expected, output_buffer
   end
 
@@ -2855,14 +2935,10 @@ class FormHelperTest < ActionView::TestCase
     txt << %{ method="#{method}">}
   end
 
-  def whole_form(action = "/", id = nil, html_class = nil, options = nil)
+  def whole_form(action = "/", id = nil, html_class = nil, options = {})
     contents = block_given? ? yield : ""
 
-    if options.is_a?(Hash)
-      method, remote, multipart = options.values_at(:method, :remote, :multipart)
-    else
-      method = options
-    end
+    method, remote, multipart = options.values_at(:method, :remote, :multipart)
 
     form_text(action, id, html_class, remote, multipart, method) + hidden_fields(method) + contents + "</form>"
   end