From 1cbe917237c3f8e6bdcbe97835b26b55354b8566 Mon Sep 17 00:00:00 2001
From: David Lee <davidomundo@gmail.com>
Date: Sun, 8 May 2011 04:40:47 -0700
Subject: [PATCH] There are no snowmen here

---
 actionpack/lib/action_view/helpers/form_tag_helper.rb | 6 +++---
 actionpack/test/template/form_helper_test.rb          | 4 ++--
 actionpack/test/template/form_tag_helper_test.rb      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index a91e86f4db..5c1a4ae483 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -611,8 +611,8 @@ def html_options_for_form(url_for_options, options, *parameters_for_url)
         end
 
         def extra_tags_for_form(html_options)
-          snowman_tag = tag(:input, :type => "hidden",
-                            :name => "utf8", :value => "&#x2713;".html_safe)
+          utf8_enforcer = tag(:input, :type => "hidden",
+                              :name => "utf8", :value => "&#x2713;".html_safe)
 
           authenticity_token = html_options.delete("authenticity_token")
           method = html_options.delete("method").to_s
@@ -629,7 +629,7 @@ def extra_tags_for_form(html_options)
               tag(:input, :type => "hidden", :name => "_method", :value => method) + token_tag(authenticity_token)
           end
 
-          tags = snowman_tag << method_tag
+          tags = utf8_enforcer << method_tag
           content_tag(:div, tags, :style => 'margin:0;padding:0;display:inline')
         end
 
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 5296556fe6..0507045ad2 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -1890,7 +1890,7 @@ def test_form_for_with_labelled_builder
     assert_dom_equal expected, output_buffer
   end
 
-  def snowman(method = nil)
+  def hidden_fields(method = nil)
     txt =  %{<div style="margin:0;padding:0;display:inline">}
     txt << %{<input name="utf8" type="hidden" value="&#x2713;" />}
     if method && !method.to_s.in?(['get', 'post'])
@@ -1918,7 +1918,7 @@ def whole_form(action = "/", id = nil, html_class = nil, options = nil)
       method = options
     end
 
-    form_text(action, id, html_class, remote, multipart, method) + snowman(method) + contents + "</form>"
+    form_text(action, id, html_class, remote, multipart, method) + hidden_fields(method) + contents + "</form>"
   end
 
   def test_default_form_builder
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index f95308b847..979251bfd1 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -9,7 +9,7 @@ def setup
     @controller = BasicController.new
   end
 
-  def snowman(options = {})
+  def hidden_fields(options = {})
     method = options[:method]
 
     txt =  %{<div style="margin:0;padding:0;display:inline">}
@@ -34,7 +34,7 @@ def form_text(action = "http://www.example.com", options = {})
   end
 
   def whole_form(action = "http://www.example.com", options = {})
-    out = form_text(action, options) + snowman(options)
+    out = form_text(action, options) + hidden_fields(options)
 
     if block_given?
       out << yield << "</form>"
-- 
GitLab