actionpack 1.9.1 → 1.10.1

data/test/template/form_helper_test.rb

@@ -6,14 +6,14 @@ require File.dirname(__FILE__) + '/../../../activesupport/lib/active_support/cor
 class FormHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormHelper
 
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
-  Post.class_eval do
-    alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
-    alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
-    alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+  silence_warnings do
+    Post = Struct.new("Post", :title, :author_name, :body, :secret, :written_on, :cost)
+    Post.class_eval do
+      alias_method :title_before_type_cast, :title unless respond_to?(:title_before_type_cast)
+      alias_method :body_before_type_cast, :body unless respond_to?(:body_before_type_cast)
+      alias_method :author_name_before_type_cast, :author_name unless respond_to?(:author_name_before_type_cast)
+    end
   end
-  $VERBOSE = old_verbose
 
   def setup
     @post = Post.new
@@ -30,52 +30,52 @@ class FormHelperTest < Test::Unit::TestCase
   end
 
   def test_text_field
-    assert_equal(
+    assert_dom_equal(
       '<input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title")
     )
-    assert_equal(
+    assert_dom_equal(
       '<input id="post_title" name="post[title]" size="30" type="password" value="Hello World" />', password_field("post", "title")
     )
-    assert_equal(
+    assert_dom_equal(
       '<input id="person_name" name="person[name]" size="30" type="password" />', password_field("person", "name")
     )
   end
 
   def test_text_field_with_escapes
     @post.title = "<b>Hello World</b>"
-    assert_equal(
+    assert_dom_equal(
       '<input id="post_title" name="post[title]" size="30" type="text" value="&lt;b&gt;Hello World&lt;/b&gt;" />', text_field("post", "title")
     )
   end
 
   def test_text_field_with_options
     expected = '<input id="post_title" name="post[title]" size="35" type="text" value="Hello World" />'
-    assert_equal expected, text_field("post", "title", "size" => 35)
-    assert_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_equal expected, text_field("post", "title", "maxlength" => 35)
-    assert_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_check_box
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret")
     )
     @post.secret = 0
-    assert_equal(
+    assert_dom_equal(
       '<input id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret")
     )
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret" ,{"checked"=>"checked"})
     )
     @post.secret = true
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret")
     )
@@ -83,23 +83,29 @@ class FormHelperTest < Test::Unit::TestCase
 
   def test_check_box_with_explicit_checked_and_unchecked_values
     @post.secret = "on"
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="on" /><input name="post[secret]" type="hidden" value="off" />',
       check_box("post", "secret", {}, "on", "off")
     )
   end
 
   def test_radio_button
-    assert_equal('<input checked="checked" id="post_title_hello_world" name="post[title]" type="radio" value="Hello World" />',
+    assert_dom_equal('<input checked="checked" id="post_title_hello_world" name="post[title]" type="radio" value="Hello World" />',
       radio_button("post", "title", "Hello World")
     )
-    assert_equal('<input id="post_title_goodbye_world" name="post[title]" type="radio" value="Goodbye World" />',
+    assert_dom_equal('<input id="post_title_goodbye_world" name="post[title]" type="radio" value="Goodbye World" />',
       radio_button("post", "title", "Goodbye World")
     )
   end
 
+  def test_radio_button_is_checked_with_integers
+    assert_dom_equal('<input checked="checked" id="post_secret_1" name="post[secret]" type="radio" value="1" />',
+      radio_button("post", "secret", "1")
+   )
+  end
+
   def test_text_area
-    assert_equal(
+    assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
       text_area("post", "body")
     )
@@ -107,77 +113,77 @@ class FormHelperTest < Test::Unit::TestCase
 
   def test_text_area_with_escapes
     @post.body        = "Back to <i>the</i> hill and over it again!"
-    assert_equal(
+    assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to &lt;i&gt;the&lt;/i&gt; hill and over it again!</textarea>',
       text_area("post", "body")
     )
   end
 
   def test_date_selects
-    assert_equal(
+    assert_dom_equal(
       '<textarea cols="40" id="post_body" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
       text_area("post", "body")
     )
   end
 
   def test_explicit_name
-    assert_equal(
+    assert_dom_equal(
       '<input id="post_title" name="dont guess" size="30" type="text" value="Hello World" />', text_field("post", "title", "name" => "dont guess")
     )
-    assert_equal(
+    assert_dom_equal(
       '<textarea cols="40" id="post_body" name="really!" rows="20">Back to the hill and over it again!</textarea>',
       text_area("post", "body", "name" => "really!")
     )
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="post_secret" name="i mean it" type="checkbox" value="1" /><input name="i mean it" type="hidden" value="0" />',
       check_box("post", "secret", "name" => "i mean it")
     )
-    assert_equal text_field("post", "title", "name" => "dont guess"),
+    assert_dom_equal text_field("post", "title", "name" => "dont guess"),
                  text_field("post", "title", :name => "dont guess")
-    assert_equal text_area("post", "body", "name" => "really!"),
+    assert_dom_equal text_area("post", "body", "name" => "really!"),
                  text_area("post", "body", :name => "really!")
-    assert_equal check_box("post", "secret", "name" => "i mean it"),
+    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_equal(
+    assert_dom_equal(
       '<input id="dont guess" name="post[title]" size="30" type="text" value="Hello World" />', text_field("post", "title", "id" => "dont guess")
     )
-    assert_equal(
+    assert_dom_equal(
       '<textarea cols="40" id="really!" name="post[body]" rows="20">Back to the hill and over it again!</textarea>',
       text_area("post", "body", "id" => "really!")
     )
-    assert_equal(
+    assert_dom_equal(
       '<input checked="checked" id="i mean it" name="post[secret]" type="checkbox" value="1" /><input name="post[secret]" type="hidden" value="0" />',
       check_box("post", "secret", "id" => "i mean it")
     )
-    assert_equal text_field("post", "title", "id" => "dont guess"),
+    assert_dom_equal text_field("post", "title", "id" => "dont guess"),
                  text_field("post", "title", :id => "dont guess")
-    assert_equal text_area("post", "body", "id" => "really!"),
+    assert_dom_equal text_area("post", "body", "id" => "really!"),
                  text_area("post", "body", :id => "really!")
-    assert_equal check_box("post", "secret", "id" => "i mean it"),
+    assert_dom_equal check_box("post", "secret", "id" => "i mean it"),
                  check_box("post", "secret", :id => "i mean it")
   end
 
   def test_auto_index
     pid = @post.id
-    assert_equal(
+    assert_dom_equal(
       "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title")
     )
-    assert_equal(
+    assert_dom_equal(
       "<textarea cols=\"40\" id=\"post_#{pid}_body\" name=\"post[#{pid}][body]\" rows=\"20\">Back to the hill and over it again!</textarea>",
       text_area("post[]", "body")
     )
-    assert_equal(
+    assert_dom_equal(
       "<input checked=\"checked\" id=\"post_#{pid}_secret\" name=\"post[#{pid}][secret]\" type=\"checkbox\" value=\"1\" /><input name=\"post[#{pid}][secret]\" type=\"hidden\" value=\"0\" />",
       check_box("post[]", "secret")
     )
-   assert_equal(
+   assert_dom_equal(
 "<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_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

data/test/template/form_options_helper_test.rb

@@ -25,12 +25,12 @@ ActionView::Helpers::FormOptionsHelper::TimeZone = MockTimeZone
 class FormOptionsHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::FormOptionsHelper
 
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
-  Continent = Struct.new('Continent', :continent_name, :countries)
-  Country   = Struct.new('Country', :country_id, :country_name)
-  Firm      = Struct.new('Firm', :time_zone)
-  $VERBOSE = old_verbose
+  silence_warnings do
+    Post      = Struct.new('Post', :title, :author_name, :body, :secret, :written_on, :category, :origin)
+    Continent = Struct.new('Continent', :continent_name, :countries)
+    Country   = Struct.new('Country', :country_id, :country_name)
+    Firm      = Struct.new('Firm', :time_zone)
+  end
 
   def test_collection_options
     @posts = [
@@ -39,7 +39,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
     ]
 
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
       options_from_collection_for_select(@posts, "author_name", "title")
     )
@@ -53,7 +53,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
     ]
 
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\">Cabe went home</option>",
       options_from_collection_for_select(@posts, "author_name", "title", "Babe")
     )
@@ -66,60 +66,60 @@ class FormOptionsHelperTest < Test::Unit::TestCase
         Post.new("Cabe went home", "Cabe", "To a little house", "shh!")
       ]
 
-      assert_equal(
+      assert_dom_equal(
         "<option value=\"&lt;Abe&gt;\">&lt;Abe&gt; went home</option>\n<option value=\"Babe\" selected=\"selected\">Babe went home</option>\n<option value=\"Cabe\" selected=\"selected\">Cabe went home</option>",
         options_from_collection_for_select(@posts, "author_name", "title", [ "Babe", "Cabe" ])
       )
   end
 
   def test_array_options_for_select
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Denmark&gt;\">&lt;Denmark&gt;</option>\n<option value=\"USA\">USA</option>\n<option value=\"Sweden\">Sweden</option>",
       options_for_select([ "<Denmark>", "USA", "Sweden" ])
     )
   end
 
   def test_array_options_for_select_with_selection
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
       options_for_select([ "Denmark", "<USA>", "Sweden" ], "<USA>")
     )
   end
 
   def test_array_options_for_select_with_selection_array
-      assert_equal(
+      assert_dom_equal(
         "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\" selected=\"selected\">Sweden</option>",
         options_for_select([ "Denmark", "<USA>", "Sweden" ], [ "<USA>", "Sweden" ])
       )
   end
 
   def test_array_options_for_string_include_in_other_string_bug_fix
-      assert_equal(
+      assert_dom_equal(
         "<option value=\"ruby\">ruby</option>\n<option value=\"rubyonrails\" selected=\"selected\">rubyonrails</option>",
         options_for_select([ "ruby", "rubyonrails" ], "rubyonrails")
       )
-      assert_equal(
+      assert_dom_equal(
         "<option value=\"ruby\" selected=\"selected\">ruby</option>\n<option value=\"rubyonrails\">rubyonrails</option>",
         options_for_select([ "ruby", "rubyonrails" ], "ruby")
       )
   end
   
   def test_hash_options_for_select
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" })
     )
   end
 
   def test_hash_options_for_select_with_selection
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, "Dollar")
     )
   end
 
   def test_hash_options_for_select_with_selection
-    assert_equal(
+    assert_dom_equal(
       "<option value=\"&lt;Kroner&gt;\" selected=\"selected\">&lt;DKR&gt;</option>\n<option value=\"Dollar\" selected=\"selected\">$</option>",
       options_for_select({ "$" => "Dollar", "<DKR>" => "<Kroner>" }, [ "Dollar", "<Kroner>" ])
     )
@@ -131,7 +131,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
       Continent.new("Europe", [Country.new("dk", "Denmark"), Country.new("ie", "Ireland")] )
     ]
 
-    assert_equal(
+    assert_dom_equal(
       "<optgroup label=\"&lt;Africa&gt;\"><option value=\"&lt;sa&gt;\">&lt;South Africa&gt;</option>\n<option value=\"so\">Somalia</option></optgroup><optgroup label=\"Europe\"><option value=\"dk\" selected=\"selected\">Denmark</option>\n<option value=\"ie\">Ireland</option></optgroup>",
       option_groups_from_collection_for_select(@continents, "countries", "continent_name", "country_id", "country_name", "dk")
     )
@@ -139,7 +139,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
 
   def test_time_zone_options_no_parms
     opts = time_zone_options_for_select
-    assert_equal "<option value=\"A\">A</option>\n" +
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
                  "<option value=\"C\">C</option>\n" +
                  "<option value=\"D\">D</option>\n" +
@@ -149,7 +149,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
 
   def test_time_zone_options_with_selected
     opts = time_zone_options_for_select( "D" )
-    assert_equal "<option value=\"A\">A</option>\n" +
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
                  "<option value=\"C\">C</option>\n" +
                  "<option value=\"D\" selected=\"selected\">D</option>\n" +
@@ -159,7 +159,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
 
   def test_time_zone_options_with_unknown_selected
     opts = time_zone_options_for_select( "K" )
-    assert_equal "<option value=\"A\">A</option>\n" +
+    assert_dom_equal "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
                  "<option value=\"C\">C</option>\n" +
                  "<option value=\"D\">D</option>\n" +
@@ -170,7 +170,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_time_zone_options_with_priority_zones
     zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( nil, zones )
-    assert_equal "<option value=\"B\">B</option>\n" +
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\">E</option>" +
                  "<option value=\"\">-------------</option>\n" +
                  "<option value=\"A\">A</option>\n" +
@@ -182,7 +182,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_time_zone_options_with_selected_priority_zones
     zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( "E", zones )
-    assert_equal "<option value=\"B\">B</option>\n" +
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\" selected=\"selected\">E</option>" +
                  "<option value=\"\">-------------</option>\n" +
                  "<option value=\"A\">A</option>\n" +
@@ -194,7 +194,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_time_zone_options_with_unselected_priority_zones
     zones = [ TimeZone.new( "B" ), TimeZone.new( "E" ) ]
     opts = time_zone_options_for_select( "C", zones )
-    assert_equal "<option value=\"B\">B</option>\n" +
+    assert_dom_equal "<option value=\"B\">B</option>\n" +
                  "<option value=\"E\">E</option>" +
                  "<option value=\"\">-------------</option>\n" +
                  "<option value=\"A\">A</option>\n" +
@@ -206,7 +206,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select
     @post = Post.new
     @post.category = "<mus>"
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest))
     )
@@ -215,7 +215,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select_with_blank
     @post = Post.new
     @post.category = "<mus>"
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :include_blank => true)
     )
@@ -224,7 +224,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select_with_default_prompt
     @post = Post.new
     @post.category = ""
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :prompt => true)
     )
@@ -233,7 +233,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select_no_prompt_when_select_has_value
     @post = Post.new
     @post.category = "<mus>"
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\" selected=\"selected\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :prompt => true)
     )
@@ -242,7 +242,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select_with_given_prompt
     @post = Post.new
     @post.category = ""
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">The prompt</option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :prompt => 'The prompt')
     )
@@ -251,7 +251,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_select_with_prompt_and_blank
     @post = Post.new
     @post.category = ""
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_category\" name=\"post[category]\"><option value=\"\">Please select</option>\n<option value=\"\"></option>\n<option value=\"abe\">abe</option>\n<option value=\"&lt;mus&gt;\">&lt;mus&gt;</option>\n<option value=\"hest\">hest</option></select>",
       select("post", "category", %w( abe <mus> hest), :prompt => true, :include_blank => true)
     )
@@ -267,7 +267,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_author_name\" name=\"post[author_name]\"><option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
       collection_select("post", "author_name", @posts, "author_name", "author_name")
     )
@@ -283,7 +283,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @post = Post.new
     @post.author_name = "Babe"
 
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_author_name\" name=\"post[author_name]\" style=\"width: 200px\"><option value=\"\"></option>\n<option value=\"&lt;Abe&gt;\">&lt;Abe&gt;</option>\n<option value=\"Babe\" selected=\"selected\">Babe</option>\n<option value=\"Cabe\">Cabe</option></select>",
       collection_select("post", "author_name", @posts, "author_name", "author_name", { :include_blank => true }, "style" => "width: 200px")
     )
@@ -292,7 +292,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_country_select
     @post = Post.new
     @post.origin = "Denmark"
-    assert_equal(
+    assert_dom_equal(
       "<select id=\"post_origin\" name=\"post[origin]\"><option value=\"Afghanistan\">Afghanistan</option>\n<option value=\"Albania\">Albania</option>\n<option value=\"Algeria\">Algeria</option>\n<option value=\"American Samoa\">American Samoa</option>\n<option value=\"Andorra\">Andorra</option>\n<option value=\"Angola\">Angola</option>\n<option value=\"Anguilla\">Anguilla</option>\n<option value=\"Antarctica\">Antarctica</option>\n<option value=\"Antigua And Barbuda\">Antigua And Barbuda</option>\n<option value=\"Argentina\">Argentina</option>\n<option value=\"Armenia\">Armenia</option>\n<option value=\"Aruba\">Aruba</option>\n<option value=\"Australia\">Australia</option>\n<option value=\"Austria\">Austria</option>\n<option value=\"Azerbaijan\">Azerbaijan</option>\n<option value=\"Bahamas\">Bahamas</option>\n<option value=\"Bahrain\">Bahrain</option>\n<option value=\"Bangladesh\">Bangladesh</option>\n<option value=\"Barbados\">Barbados</option>\n<option value=\"Belarus\">Belarus</option>\n<option value=\"Belgium\">Belgium</option>\n<option value=\"Belize\">Belize</option>\n<option value=\"Benin\">Benin</option>\n<option value=\"Bermuda\">Bermuda</option>\n<option value=\"Bhutan\">Bhutan</option>\n<option value=\"Bolivia\">Bolivia</option>\n<option value=\"Bosnia and Herzegowina\">Bosnia and Herzegowina</option>\n<option value=\"Botswana\">Botswana</option>\n<option value=\"Bouvet Island\">Bouvet Island</option>\n<option value=\"Brazil\">Brazil</option>\n<option value=\"British Indian Ocean Territory\">British Indian Ocean Territory</option>\n<option value=\"Brunei Darussalam\">Brunei Darussalam</option>\n<option value=\"Bulgaria\">Bulgaria</option>\n<option value=\"Burkina Faso\">Burkina Faso</option>\n<option value=\"Burma\">Burma</option>\n<option value=\"Burundi\">Burundi</option>\n<option value=\"Cambodia\">Cambodia</option>\n<option value=\"Cameroon\">Cameroon</option>\n<option value=\"Canada\">Canada</option>\n<option value=\"Cape Verde\">Cape Verde</option>\n<option value=\"Cayman Islands\">Cayman Islands</option>\n<option value=\"Central African Republic\">Central African Republic</option>\n<option value=\"Chad\">Chad</option>\n<option value=\"Chile\">Chile</option>\n<option value=\"China\">China</option>\n<option value=\"Christmas Island\">Christmas Island</option>\n<option value=\"Cocos (Keeling) Islands\">Cocos (Keeling) Islands</option>\n<option value=\"Colombia\">Colombia</option>\n<option value=\"Comoros\">Comoros</option>\n<option value=\"Congo\">Congo</option>\n<option value=\"Congo, the Democratic Republic of the\">Congo, the Democratic Republic of the</option>\n<option value=\"Cook Islands\">Cook Islands</option>\n<option value=\"Costa Rica\">Costa Rica</option>\n<option value=\"Cote d'Ivoire\">Cote d'Ivoire</option>\n<option value=\"Croatia\">Croatia</option>\n<option value=\"Cuba\">Cuba</option>\n<option value=\"Cyprus\">Cyprus</option>\n<option value=\"Czech Republic\">Czech Republic</option>\n<option value=\"Denmark\" selected=\"selected\">Denmark</option>\n<option value=\"Djibouti\">Djibouti</option>\n<option value=\"Dominica\">Dominica</option>\n<option value=\"Dominican Republic\">Dominican Republic</option>\n<option value=\"East Timor\">East Timor</option>\n<option value=\"Ecuador\">Ecuador</option>\n<option value=\"Egypt\">Egypt</option>\n<option value=\"El Salvador\">El Salvador</option>\n<option value=\"England\">England" +
       "</option>\n<option value=\"Equatorial Guinea\">Equatorial Guinea</option>\n<option value=\"Eritrea\">Eritrea</option>\n<option value=\"Espana\">Espana</option>\n<option value=\"Estonia\">Estonia</option>\n<option value=\"Ethiopia\">Ethiopia</option>\n<option value=\"Falkland Islands\">Falkland Islands</option>\n<option value=\"Faroe Islands\">Faroe Islands</option>\n<option value=\"Fiji\">Fiji</option>\n<option value=\"Finland\">Finland</option>\n<option value=\"France\">France</option>\n<option value=\"French Guiana\">French Guiana</option>\n<option value=\"French Polynesia\">French Polynesia</option>\n<option value=\"French Southern Territories\">French Southern Territories</option>\n<option value=\"Gabon\">Gabon</option>\n<option value=\"Gambia\">Gambia</option>\n<option value=\"Georgia\">Georgia</option>\n<option value=\"Germany\">Germany</option>\n<option value=\"Ghana\">Ghana</option>\n<option value=\"Gibraltar\">Gibraltar</option>\n<option value=\"Great Britain\">Great Britain</option>\n<option value=\"Greece\">Greece</option>\n<option value=\"Greenland\">Greenland</option>\n<option value=\"Grenada\">Grenada</option>\n<option value=\"Guadeloupe\">Guadeloupe</option>\n<option value=\"Guam\">Guam</option>\n<option value=\"Guatemala\">Guatemala</option>\n<option value=\"Guinea\">Guinea</option>\n<option value=\"Guinea-Bissau\">Guinea-Bissau</option>\n<option value=\"Guyana\">Guyana</option>\n<option value=\"Haiti\">Haiti</option>\n<option value=\"Heard and Mc Donald Islands\">Heard and Mc Donald Islands</option>\n<option value=\"Honduras\">Honduras</option>\n<option value=\"Hong Kong\">Hong Kong</option>\n<option value=\"Hungary\">Hungary</option>\n<option value=\"Iceland\">Iceland</option>\n<option value=\"India\">India</option>\n<option value=\"Indonesia\">Indonesia</option>\n<option value=\"Ireland\">Ireland</option>\n<option value=\"Israel\">Israel</option>\n<option value=\"Italy\">Italy</option>\n<option value=\"Iran\">Iran</option>\n<option value=\"Iraq\">Iraq</option>\n<option value=\"Jamaica\">Jamaica</option>\n<option value=\"Japan\">Japan</option>\n<option value=\"Jordan\">Jordan</option>\n<option value=\"Kazakhstan\">Kazakhstan</option>\n<option value=\"Kenya\">Kenya</option>\n<option value=\"Kiribati\">Kiribati</option>\n<option value=\"Korea, Republic of\">Korea, Republic of</option>\n<option value=\"Korea (South)\">Korea (South)</option>\n<option value=\"Kuwait\">Kuwait</option>\n<option value=\"Kyrgyzstan\">Kyrgyzstan</option>\n<option value=\"Lao People's Democratic Republic\">Lao People's Democratic Republic</option>\n<option value=\"Latvia\">Latvia</option>\n<option value=\"Lebanon\">Lebanon</option>\n<option value=\"Lesotho\">Lesotho</option>\n<option value=\"Liberia\">Liberia</option>\n<option value=\"Liechtenstein\">Liechtenstein</option>\n<option value=\"Lithuania\">Lithuania</option>\n<option value=\"Luxembourg\">Luxembourg</option>\n<option value=\"Macau\">Macau</option>\n<option value=\"Macedonia\">Macedonia</option>\n<option value=\"Madagascar\">Madagascar</option>\n<option value=\"Malawi\">Malawi</option>\n<option value=\"Malaysia\">Malaysia</option>\n<option value=\"Maldives\">Maldives</option>\n<option value=\"Mali\">Mali</option>\n<option value=\"Malta\">Malta</option>\n<option value=\"Marshall Islands\">Marshall Islands</option>\n<option value=\"Martinique\">Martinique</option>\n<option value=\"Mauritania\">Mauritania</option>\n<option value=\"Mauritius\">Mauritius</option>\n<option value=\"Mayotte\">Mayotte</option>\n<option value=\"Mexico\">Mexico</option>\n<option value=\"Micronesia, Federated States of\">Micronesia, Federated States of</option>\n<option value=\"Moldova, Republic of\">Moldova, Republic of</option>\n<option value=\"Monaco\">Monaco</option>\n<option value=\"Mongolia\">Mongolia</option>\n<option value=\"Montserrat\">Montserrat</option>\n<option value=\"Morocco\">Morocco</option>\n<option value=\"Mozambique\">Mozambique</option>\n<option value=\"Myanmar\">Myanmar</option>\n<option value=\"Namibia\">Namibia</option>\n<option value=\"Nauru\">Nauru</option>\n<option value=\"Nepal\">Nepal</option>\n<option value=\"Netherlands\">Netherlands</option>\n<option value=\"Netherlands Antilles\">Netherlands Antilles</option>\n<option value=\"New Caledonia\">New Caledonia</option>" +
       "\n<option value=\"New Zealand\">New Zealand</option>\n<option value=\"Nicaragua\">Nicaragua</option>\n<option value=\"Niger\">Niger</option>\n<option value=\"Nigeria\">Nigeria</option>\n<option value=\"Niue\">Niue</option>\n<option value=\"Norfolk Island\">Norfolk Island</option>\n<option value=\"Northern Ireland\">Northern Ireland</option>\n<option value=\"Northern Mariana Islands\">Northern Mariana Islands</option>\n<option value=\"Norway\">Norway</option>\n<option value=\"Oman\">Oman</option>\n<option value=\"Pakistan\">Pakistan</option>\n<option value=\"Palau\">Palau</option>\n<option value=\"Panama\">Panama</option>\n<option value=\"Papua New Guinea\">Papua New Guinea</option>\n<option value=\"Paraguay\">Paraguay</option>\n<option value=\"Peru\">Peru</option>\n<option value=\"Philippines\">Philippines</option>\n<option value=\"Pitcairn\">Pitcairn</option>\n<option value=\"Poland\">Poland</option>\n<option value=\"Portugal\">Portugal</option>\n<option value=\"Puerto Rico\">Puerto Rico</option>\n<option value=\"Qatar\">Qatar</option>\n<option value=\"Reunion\">Reunion</option>\n<option value=\"Romania\">Romania</option>\n<option value=\"Russia\">Russia</option>\n<option value=\"Rwanda\">Rwanda</option>\n<option value=\"Saint Kitts and Nevis\">Saint Kitts and Nevis</option>\n<option value=\"Saint Lucia\">Saint Lucia</option>\n<option value=\"Saint Vincent and the Grenadines\">Saint Vincent and the Grenadines</option>\n<option value=\"Samoa (Independent)\">Samoa (Independent)</option>\n<option value=\"San Marino\">San Marino</option>\n<option value=\"Sao Tome and Principe\">Sao Tome and Principe</option>\n<option value=\"Saudi Arabia\">Saudi Arabia</option>\n<option value=\"Scotland\">Scotland</option>\n<option value=\"Senegal\">Senegal</option>\n<option value=\"Serbia and Montenegro\">Serbia and Montenegro</option>\n<option value=\"Seychelles\">Seychelles</option>\n<option value=\"Sierra Leone\">Sierra Leone</option>\n<option value=\"Singapore\">Singapore</option>\n<option value=\"Slovakia\">Slovakia</option>\n<option value=\"Slovenia\">Slovenia</option>\n<option value=\"Solomon Islands\">Solomon Islands</option>\n<option value=\"Somalia\">Somalia</option>\n<option value=\"South Africa\">South Africa</option>\n<option value=\"South Georgia and the South Sandwich Islands\">South Georgia and the South Sandwich Islands</option>\n<option value=\"South Korea\">South Korea</option>\n<option value=\"Spain\">Spain</option>\n<option value=\"Sri Lanka\">Sri Lanka</option>\n<option value=\"St. Helena\">St. Helena</option>\n<option value=\"St. Pierre and Miquelon\">St. Pierre and Miquelon</option>\n<option value=\"Suriname\">Suriname</option>\n<option value=\"Svalbard and Jan Mayen Islands\">Svalbard and Jan Mayen Islands</option>\n<option value=\"Swaziland\">Swaziland</option>\n<option value=\"Sweden\">Sweden</option>\n<option value=\"Switzerland\">Switzerland</option>\n<option value=\"Taiwan\">Taiwan</option>\n<option value=\"Tajikistan\">Tajikistan</option>\n<option value=\"Tanzania\">Tanzania</option>\n<option value=\"Thailand\">Thailand</option>\n<option value=\"Togo\">Togo</option>\n<option value=\"Tokelau\">Tokelau</option>\n<option value=\"Tonga\">Tonga</option>\n<option value=\"Trinidad\">Trinidad</option>\n<option value=\"Trinidad and Tobago\">Trinidad and Tobago</option>\n<option value=\"Tunisia\">Tunisia</option>\n<option value=\"Turkey\">Turkey</option>\n<option value=\"Turkmenistan\">" +
@@ -304,7 +304,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_time_zone_select
     @firm = Firm.new("D")
     html = time_zone_select( "firm", "time_zone" )
-    assert_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
                  "<option value=\"C\">C</option>\n" +
@@ -317,7 +317,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
   def test_time_zone_select_with_blank
     @firm = Firm.new("D")
     html = time_zone_select("firm", "time_zone", nil, :include_blank => true)
-    assert_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                  "<option value=\"\"></option>\n" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
@@ -332,7 +332,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @firm = Firm.new("D")
     html = time_zone_select("firm", "time_zone", nil, {},
       "style" => "color: red")
-    assert_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
                  "<option value=\"C\">C</option>\n" +
@@ -340,7 +340,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
                  "<option value=\"E\">E</option>" +
                  "</select>",
                  html
-    assert_equal html, time_zone_select("firm", "time_zone", nil, {},
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil, {},
       :style => "color: red")
   end
 
@@ -348,7 +348,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @firm = Firm.new("D")
     html = time_zone_select("firm", "time_zone", nil,
       { :include_blank => true }, "style" => "color: red")
-    assert_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\" style=\"color: red\">" +
                  "<option value=\"\"></option>\n" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"B\">B</option>\n" +
@@ -357,7 +357,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
                  "<option value=\"E\">E</option>" +
                  "</select>",
                  html
-    assert_equal html, time_zone_select("firm", "time_zone", nil,
+    assert_dom_equal html, time_zone_select("firm", "time_zone", nil,
       { :include_blank => true }, :style => "color: red")
   end
 
@@ -365,7 +365,7 @@ class FormOptionsHelperTest < Test::Unit::TestCase
     @firm = Firm.new("D")
     zones = [ TimeZone.new("A"), TimeZone.new("D") ]
     html = time_zone_select("firm", "time_zone", zones )
-    assert_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
+    assert_dom_equal "<select id=\"firm_time_zone\" name=\"firm[time_zone]\">" +
                  "<option value=\"A\">A</option>\n" +
                  "<option value=\"D\" selected=\"selected\">D</option>" +
                  "<option value=\"\">-------------</option>\n" +