Fix several known web encoding issues:

* Specify accept-charset on all forms. All recent browsers,
  as well as IE5+, will use the encoding specified for form
  parameters
* Unfortunately, IE5+ will not look at accept-charset unless
  at least one character in the form's values is not in the
  page's charset. Since the user can override the default
  charset (which Rails sets to UTF-8), we provide a hidden
  input containing a unicode character, forcing IE to look
  at the accept-charset.
* Now that the vast majority of web input is UTF-8, we set
  the inbound parameters to UTF-8. This will eliminate many
  cases of incompatible encodings between ASCII-8BIT and
  UTF-8.
* You can safely ignore params[:_snowman_]

TODO:

* Validate inbound text to confirm it is UTF-8
* Combine the whole_form implementations in form_helper_test
  and form_tag_helper_test

4 files changed, 253 insertions, 194 deletions

diff --git a/actionpack/test/template/erb/form_for_test.rb b/actionpack/test/template/erb/form_for_test.rb
index ec6e872735..e722b40a9a 100644
--- a/actionpack/test/template/erb/form_for_test.rb
+++ b/actionpack/test/template/erb/form_for_test.rb
@@ -5,7 +5,7 @@ module ERBTest
   class TagHelperTest < BlockTestCase
     test "form_for works" do
       output = render_content "form_for(:staticpage, :url => {:controller => 'blah', :action => 'update'})", ""
-      assert_equal "<form action=\"/blah/update\" method=\"post\"></form>", output
+      assert_match %r{<form.*action="/blah/update".*method="post">.*</form>}, output
     end
   end
 end
diff --git a/actionpack/test/template/erb/tag_helper_test.rb b/actionpack/test/template/erb/tag_helper_test.rb
index 64a88bde1d..d073100986 100644
--- a/actionpack/test/template/erb/tag_helper_test.rb
+++ b/actionpack/test/template/erb/tag_helper_test.rb
@@ -28,8 +28,8 @@ module ERBTest
     end
 
     test "percent equals works with form tags" do
-      expected_output = "<form action=\"foo\" method=\"post\">hello</form>"
-      maybe_deprecated { assert_equal expected_output, render_content("form_tag('foo')", "<%= 'hello' %>") }
+      expected_output = %r{<form.*action="foo".*method="post">.*hello*</form>}
+      maybe_deprecated { assert_match expected_output, render_content("form_tag('foo')", "<%= 'hello' %>") }
     end
 
     test "percent equals works with fieldset tags" do
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index 6ba407e230..eb6cf92805 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -583,7 +583,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<form accept-charset='UTF-8' action='http://www.example.com' id='create-post' method='post'>" +
+      snowman +
       "<label for='post_title'>The Title</label>" +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
@@ -604,15 +605,14 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit('Create post')
     end
 
-    expected =
-      "<form class='other_name_edit' method='post' action='/posts/123' id='create-post'>" +
-      "<div style='margin:0;padding:0;display:inline'><input name='_method' value='put' type='hidden' /></div>" +
+    expected =  whole_form("/posts/123", "create-post", "other_name_edit", :method => "put") do
       "<label for='other_name_title'>Title</label>" +
       "<input name='other_name[title]' size='30' id='other_name_title' value='Hello World' type='text' />" +
       "<textarea name='other_name[body]' id='other_name_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='other_name[secret]' value='0' type='hidden' />" +
       "<input name='other_name[secret]' checked='checked' id='other_name_secret' value='1' type='checkbox' />" +
-      "<input name='commit' id='other_name_submit' value='Create post' type='submit' /></form>"
+      "<input name='commit' id='other_name_submit' value='Create post' type='submit' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -626,14 +626,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' id='create-post' method='post'>" +
-      "<div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div>" +
+    expected =  whole_form("http://www.example.com", "create-post", nil, "put") do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "</form>"
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -647,14 +645,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' id='create-post' method='post' data-remote='true'>" +
-      "<div style='margin:0;padding:0;display:inline'><input name='_method' type='hidden' value='put' /></div>" +
+    expected =  whole_form("http://www.example.com", "create-post", nil, :method => "put", :remote => true) do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "</form>"
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -668,13 +664,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' method='post' data-remote='true'>" +
+    expected =  whole_form("http://www.example.com", nil, nil, :remote => true) do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "</form>"
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -686,13 +681,12 @@ class FormHelperTest < ActionView::TestCase
       concat f.check_box(:secret)
     end
 
-    expected =
-      "<form action='http://www.example.com' id='create-post' method='post'>" +
+    expected =  whole_form("http://www.example.com", "create-post") do
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[secret]' type='hidden' value='0' />" +
-      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />" +
-      "</form>"
+      "<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -707,14 +701,13 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' method='post'>" +
+    expected = whole_form do
       "<label for='post_123_title'>Title</label>" +
       "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
       "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[123][secret]' type='hidden' value='0' />" +
-      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" +
-      "</form>"
+      "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -728,13 +721,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' method='post'>" +
+    expected = whole_form do
       "<input name='post[][title]' size='30' type='text' id='post__title' value='Hello World' />" +
       "<textarea name='post[][body]' id='post__body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='post[][secret]' type='hidden' value='0' />" +
-      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />" +
-      "</form>"
+      "<input name='post[][secret]' checked='checked' type='checkbox' id='post__secret' value='1' />"
+    end
 
     assert_dom_equal expected, output_buffer
   end
@@ -749,9 +741,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='commit' id='post_submit' type='submit' value='Create Post' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='commit' id='post_submit' type='submit' value='Create Post' />"
+                end
+
     assert_dom_equal expected, output_buffer
   ensure
     I18n.locale = old_locale
@@ -766,9 +759,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='commit' id='post_submit' type='submit' value='Confirm Post changes' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='commit' id='post_submit' type='submit' value='Confirm Post changes' />"
+                end
+
     assert_dom_equal expected, output_buffer
   ensure
     I18n.locale = old_locale
@@ -781,9 +775,10 @@ class FormHelperTest < ActionView::TestCase
       concat f.submit :class => "extra"
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='commit' class='extra' id='post_submit' type='submit' value='Save changes' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='commit' class='extra' id='post_submit' type='submit' value='Save changes' />"
+                end
+
     assert_dom_equal expected, output_buffer
   ensure
     I18n.locale = old_locale
@@ -798,9 +793,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='commit' id='another_post_submit' type='submit' value='Update your Post' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='commit' id='another_post_submit' type='submit' value='Update your Post' />"
+                end
+
     assert_dom_equal expected, output_buffer
   ensure
     I18n.locale = old_locale
@@ -815,9 +811,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[comment][title]' size='30' type='text' id='post_comment_title' value='Hello World' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[comment][title]' size='30' type='text' id='post_comment_title' value='Hello World' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -832,10 +828,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
-               "<input name='post[123][comment][][name]' size='30' type='text' id='post_123_comment__name' value='new comment' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" +
+                  "<input name='post[123][comment][][name]' size='30' type='text' id='post_123_comment__name' value='new comment' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -850,10 +846,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[1][title]' size='30' type='text' id='post_1_title' value='Hello World' />" +
-               "<input name='post[1][comment][1][name]' size='30' type='text' id='post_1_comment_1_name' value='new comment' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[1][title]' size='30' type='text' id='post_1_title' value='Hello World' />" +
+                  "<input name='post[1][comment][1][name]' size='30' type='text' id='post_1_comment_1_name' value='new comment' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -867,9 +863,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[1][comment][title]' size='30' type='text' id='post_1_comment_title' value='Hello World' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[1][comment][title]' size='30' type='text' id='post_1_comment_title' value='Hello World' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -883,9 +879,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[1][comment][5][title]' size='30' type='text' id='post_1_comment_5_title' value='Hello World' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[1][comment][5][title]' size='30' type='text' id='post_1_comment_5_title' value='Hello World' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -899,9 +895,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[123][comment][title]' size='30' type='text' id='post_123_comment_title' value='Hello World' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[123][comment][title]' size='30' type='text' id='post_123_comment_title' value='Hello World' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -915,9 +911,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[comment][5][title]' type='radio' id='post_comment_5_title_hello' value='hello' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[comment][5][title]' type='radio' id='post_comment_5_title_hello' value='hello' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -931,9 +927,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = "<form action='http://www.example.com' method='post'>" +
-               "<input name='post[123][comment][123][title]' size='30' type='text' id='post_123_comment_123_title' value='Hello World' />" +
-               "</form>"
+    expected =  whole_form do
+                  "<input name='post[123][comment][123][title]' size='30' type='text' id='post_123_comment_123_title' value='Hello World' />"
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -952,12 +948,11 @@ class FormHelperTest < ActionView::TestCase
         }
       end
 
-      expected = "<form action='http://www.example.com' method='post'>" +
-                 "<input name='post[123][comment][5][title]' size='30' type='text' id='post_123_comment_5_title' value='Hello World' />" +
-                 "</form>" +
-                 "<form action='http://www.example.com' method='post'>" +
-                 "<input name='post[1][comment][123][title]' size='30' type='text' id='post_1_comment_123_title' value='Hello World' />" +
-                 "</form>"
+      expected =  whole_form do
+                    "<input name='post[123][comment][5][title]' size='30' type='text' id='post_123_comment_5_title' value='Hello World' />"
+                  end + whole_form do
+                    "<input name='post[1][comment][123][title]' size='30' type='text' id='post_1_comment_123_title' value='Hello World' />"
+                  end
 
       assert_dom_equal expected, output_buffer
     end
@@ -975,10 +970,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="new author" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1006,11 +1001,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
-               '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_author_attributes_name" name="post[author_attributes][name]" size="30" type="text" value="author #321" />' +
+                  '<input id="post_author_attributes_id" name="post[author_attributes][id]" type="hidden" value="321" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1028,11 +1023,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" 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]" size="30" type="text" value="author #321" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" 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]" size="30" type="text" value="author #321" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1051,13 +1046,13 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
-               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+                  '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1077,13 +1072,13 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" 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]" size="30" type="text" value="comment #1" />' +
-               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" 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]" size="30" type="text" value="comment #1" />' +
+                  '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1102,11 +1097,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="new comment" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1125,12 +1120,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1145,9 +1140,9 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1164,13 +1159,13 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
-               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+                  '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1188,13 +1183,13 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
-               '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #1" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="1" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="comment #2" />' +
+                  '<input id="post_comments_attributes_1_id" name="post[comments_attributes][1][id]" type="hidden" value="2" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1213,12 +1208,12 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-               '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input name="post[title]" size="30" type="text" id="post_title" value="Hello World" />' +
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+                  '<input id="post_comments_attributes_1_name" name="post[comments_attributes][1][name]" size="30" type="text" value="new comment" />'
+                end
 
     assert_dom_equal expected, output_buffer
     assert_equal yielded_comments, @post.comments
@@ -1235,10 +1230,10 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
-               '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input id="post_comments_attributes_abc_name" name="post[comments_attributes][abc][name]" size="30" type="text" value="comment #321" />' +
+                  '<input id="post_comments_attributes_abc_id" name="post[comments_attributes][abc][id]" type="hidden" value="321" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1273,20 +1268,20 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected = '<form action="http://www.example.com" method="post">' +
-               '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
-               '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" 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" />' +
-               '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
-               '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
-               '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
-               '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
-               '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
-               '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
-               '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
-               '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
-               '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />' +
-               '</form>'
+    expected =  whole_form do
+                  '<input id="post_comments_attributes_0_name" name="post[comments_attributes][0][name]" size="30" type="text" value="comment #321" />' +
+                  '<input id="post_comments_attributes_0_relevances_attributes_0_value" name="post[comments_attributes][0][relevances_attributes][0][value]" size="30" 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" />' +
+                  '<input id="post_comments_attributes_0_id" name="post[comments_attributes][0][id]" type="hidden" value="321" />' +
+                  '<input id="post_tags_attributes_0_value" name="post[tags_attributes][0][value]" size="30" type="text" value="tag #123" />' +
+                  '<input id="post_tags_attributes_0_relevances_attributes_0_value" name="post[tags_attributes][0][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #3141" />' +
+                  '<input id="post_tags_attributes_0_relevances_attributes_0_id" name="post[tags_attributes][0][relevances_attributes][0][id]" type="hidden" value="3141" />' +
+                  '<input id="post_tags_attributes_0_id" name="post[tags_attributes][0][id]" type="hidden" value="123" />' +
+                  '<input id="post_tags_attributes_1_value" name="post[tags_attributes][1][value]" size="30" type="text" value="tag #456" />' +
+                  '<input id="post_tags_attributes_1_relevances_attributes_0_value" name="post[tags_attributes][1][relevances_attributes][0][value]" size="30" type="text" value="tagrelevance #31415" />' +
+                  '<input id="post_tags_attributes_1_relevances_attributes_0_id" name="post[tags_attributes][1][relevances_attributes][0][id]" type="hidden" value="31415" />' +
+                  '<input id="post_tags_attributes_1_id" name="post[tags_attributes][1][id]" type="hidden" value="456" />'
+                end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1426,7 +1421,8 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<form action='http://www.example.com' id='create-post' method='post'>" +
+      "<form accept-charset='UTF-8' action='http://www.example.com' id='create-post' method='post'>" +
+      snowman +
       "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
       "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
       "<input name='parent_post[secret]' type='hidden' value='0' />" +
@@ -1449,11 +1445,11 @@ class FormHelperTest < ActionView::TestCase
     end
 
     expected =
-      "<form action='http://www.example.com' id='create-post' method='post'>" +
-      "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
-      "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
-      "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />" +
-      "</form>"
+      whole_form("http://www.example.com", "create-post") do
+        "<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />" +
+        "<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" +
+        "<input name='post[comment][name]' type='text' id='post_comment_name' value='new comment' size='30' />"
+      end
 
     assert_dom_equal expected, output_buffer
   end
@@ -1477,16 +1473,42 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' method='post'>" +
-      "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
-      "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back 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/>" +
-      "</form>"
+    expected =  whole_form do
+        "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
+        "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back 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/>"
+      end
 
     assert_dom_equal expected, output_buffer
   end
 
+  def snowman(method = nil)
+    txt =  %{<div style="margin:0;padding:0;display:inline">}
+    txt << %{<input name="_snowman_" type="hidden" value="&#9731;" />}
+    txt << %{<input name="_method" type="hidden" value="#{method}" />} if method
+    txt << %{</div>}
+  end
+
+  def form_text(action = "http://www.example.com", id = nil, html_class = nil, remote = nil)
+    txt =  %{<form accept-charset="UTF-8" action="#{action}"}
+    txt << %{ data-remote="true"} if remote
+    txt << %{ class="#{html_class}"} if html_class
+    txt << %{ id="#{id}"} if id
+    txt << %{ method="post">}
+  end
+
+  def whole_form(action = "http://www.example.com", id = nil, html_class = nil, options = nil)
+    contents = block_given? ? yield : ""
+
+    if options.is_a?(Hash)
+      method, remote = options.values_at(:method, :remote)
+    else
+      method = options
+    end
+
+    form_text(action, id, html_class, remote) + snowman(method) + contents + "</form>"
+  end
+
   def test_default_form_builder
     old_default_form_builder, ActionView::Base.default_form_builder =
       ActionView::Base.default_form_builder, LabelledFormBuilder
@@ -1499,12 +1521,11 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    expected =
-      "<form action='http://www.example.com' method='post'>" +
+    expected =  whole_form do
       "<label for='title'>Title:</label> <input name='post[title]' size='30' type='text' id='post_title' value='Hello World' /><br/>" +
       "<label for='body'>Body:</label> <textarea name='post[body]' id='post_body' rows='20' cols='40'>Back 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/>" +
-      "</form>"
+      "<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/>"
+    end
 
     assert_dom_equal expected, output_buffer
   ensure
@@ -1577,7 +1598,7 @@ class FormHelperTest < ActionView::TestCase
     assert_deprecated do
       form_for(:post, @post, :html => {:id => 'some_form', :class => 'some_class'}) do |f| end
     end
-    expected = "<form action=\"http://www.example.com\" class=\"some_class\" id=\"some_form\" method=\"post\"></form>"
+    expected = whole_form("http://www.example.com", "some_form", "some_class")
 
     assert_dom_equal expected, output_buffer
   end
@@ -1587,7 +1608,8 @@ class FormHelperTest < ActionView::TestCase
       form_for(:post, @post, :url => 'http://www.otherdomain.com') do |f| end
     end
 
-    assert_equal '<form action="http://www.otherdomain.com" method="post"></form>', output_buffer
+    assert_equal whole_form("http://www.otherdomain.com"), output_buffer
+    # assert_equal '<form action="http://www.otherdomain.com" method="post"></form>', output_buffer
   end
 
   def test_form_for_with_hash_url_option
@@ -1604,14 +1626,15 @@ class FormHelperTest < ActionView::TestCase
       form_for(:post, @post, :url => @post) do |f| end
     end
 
-    expected = "<form action=\"/posts/123\" method=\"post\"></form>"
+    expected = whole_form("/posts/123")
+    # expected = "<form action=\"/posts/123\" method=\"post\"></form>"
     assert_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object
     form_for(@post) do |f| end
 
-    expected = "<form action=\"/posts/123\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
+    expected = whole_form("/posts/123", "edit_post_123", "edit_post", "put")
     assert_equal expected, output_buffer
   end
 
@@ -1622,7 +1645,7 @@ class FormHelperTest < ActionView::TestCase
 
     form_for(post) do |f| end
 
-    expected = "<form action=\"/posts\" class=\"new_post\" id=\"new_post\" method=\"post\"></form>"
+    expected = whole_form("/posts", "new_post", "new_post")
     assert_equal expected, output_buffer
   end
 
@@ -1630,14 +1653,14 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([@post, @comment]) {}
 
-    expected = %(<form action="#{comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
+    expected = whole_form(comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object_in_list
     form_for([@post, @comment]) {}
 
-    expected = %(<form action="#{comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
+    expected = whole_form(comments_path(@post), "new_comment", "new_comment")
     assert_dom_equal expected, output_buffer
   end
 
@@ -1645,21 +1668,21 @@ class FormHelperTest < ActionView::TestCase
     @comment.save
     form_for([:admin, @post, @comment]) {}
 
-    expected = %(<form action="#{admin_comment_path(@post, @comment)}" class="edit_comment" id="edit_comment_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="_method" type="hidden" value="put" /></div></form>)
+    expected = whole_form(admin_comment_path(@post, @comment), "edit_comment_1", "edit_comment", "put")
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_new_object_and_namespace_in_list
     form_for([:admin, @post, @comment]) {}
 
-    expected = %(<form action="#{admin_comments_path(@post)}" class="new_comment" id="new_comment" method="post"></form>)
+    expected = whole_form(admin_comments_path(@post), "new_comment", "new_comment")
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_for_with_existing_object_and_custom_url
     form_for(@post, :url => "/super_posts") do |f| end
 
-    expected = "<form action=\"/super_posts\" class=\"edit_post\" id=\"edit_post_123\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"_method\" type=\"hidden\" value=\"put\" /></div></form>"
+    expected = whole_form("/super_posts", "edit_post_123", "edit_post", "put")
     assert_equal expected, output_buffer
   end
 
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index b75863bb6a..75d2773c0a 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -8,6 +8,36 @@ class FormTagHelperTest < ActionView::TestCase
     @controller = BasicController.new
   end
 
+  def snowman(options = {})
+    method = options[:method]
+
+    txt =  %{<div style="margin:0;padding:0;display:inline">}
+    txt << %{<input name="_snowman_" type="hidden" value="&#9731;" />}
+    txt << %{<input name="_method" type="hidden" value="#{method}" />} if method
+    txt << %{</div>}
+  end
+
+  def form_text(action = "http://www.example.com", options = {})
+    remote, enctype, html_class, id = options.values_at(:remote, :enctype, :html_class, :id)
+
+    txt =  %{<form accept-charset="UTF-8" action="#{action}"}
+    txt << %{ enctype="multipart/form-data"} if enctype
+    txt << %{ data-remote="true"} if remote
+    txt << %{ class="#{html_class}"} if html_class
+    txt << %{ id="#{id}"} if id
+    txt << %{ method="post">}
+  end
+
+  def whole_form(action = "http://www.example.com", options = {})
+    out = form_text(action, options) + snowman(options)
+
+    if block_given?
+      out << yield << "</form>"
+    end
+
+    out
+  end
+
   def url_for(options)
     if options.is_a?(Hash)
       "http://www.example.com"
@@ -31,51 +61,57 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_form_tag
     actual = form_tag
-    expected = %(<form action="http://www.example.com" method="post">)
+    expected = whole_form
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_multipart
     actual = form_tag({}, { 'multipart' => true })
-    expected = %(<form action="http://www.example.com" enctype="multipart/form-data" method="post">)
+    expected = whole_form("http://www.example.com", :enctype => true)
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_method_put
     actual = form_tag({}, { :method => :put })
-    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>)
+    expected = whole_form("http://www.example.com", :method => :put)
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_method_delete
     actual = form_tag({}, { :method => :delete })
-    expected = %(<form action="http://www.example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="delete" /></div>)
+
+    expected = whole_form("http://www.example.com", :method => :delete)
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_remote
     actual = form_tag({}, :remote => true)
-    expected = %(<form action="http://www.example.com" method="post" data-remote="true">)
+
+    expected = whole_form("http://www.example.com", :remote => true)
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_remote_false
     actual = form_tag({}, :remote => false)
-    expected = %(<form action="http://www.example.com" method="post">)
+
+    expected = whole_form
     assert_dom_equal expected, actual
   end
 
   def test_form_tag_with_block_in_erb
-    output_buffer = form_tag("http://example.com") { concat "Hello world!" }
+    output_buffer = form_tag("http://www.example.com") { concat "Hello world!" }
 
-    expected = %(<form action="http://example.com" method="post">Hello world!</form>)
+    expected = whole_form { "Hello world!" }
     assert_dom_equal expected, output_buffer
   end
 
   def test_form_tag_with_block_and_method_in_erb
-    output_buffer = form_tag("http://example.com", :method => :put) { concat "Hello world!" }
+    output_buffer = form_tag("http://www.example.com", :method => :put) { concat "Hello world!" }
+
+    expected = whole_form("http://www.example.com", :method => "put") do
+      "Hello world!"
+    end
 
-    expected = %(<form action="http://example.com" method="post"><div style='margin:0;padding:0;display:inline'><input type="hidden" name="_method" value="put" /></div>Hello world!</form>)
     assert_dom_equal expected, output_buffer
   end