Merge pull request #5505 from arunagw/build_fix_1.8.7-3-2-stable

Build fix 1.8.7 3 2 stable

2 files changed, 7 insertions, 9 deletions

diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb
index 37b9de350b..b8b14f3a24 100644
--- a/actionpack/test/controller/request_forgery_protection_test.rb
+++ b/actionpack/test/controller/request_forgery_protection_test.rb
@@ -115,7 +115,7 @@ module RequestForgeryProtectionTests
     assert_not_blocked do
       get :form_for_remote
     end
-    assert_no_match /authenticity_token/, response.body
+    assert_no_match(/authenticity_token/, response.body)
   end
 
   def test_should_render_form_with_token_tag_if_remote_and_authenticity_token_requested
diff --git a/actionpack/test/template/form_options_helper_test.rb b/actionpack/test/template/form_options_helper_test.rb
index 5b19bcf0f9..09b1bd3884 100644
--- a/actionpack/test/template/form_options_helper_test.rb
+++ b/actionpack/test/template/form_options_helper_test.rb
@@ -1045,17 +1045,15 @@ class FormOptionsHelperTest < ActionView::TestCase
   end
 
   def test_option_html_attributes_with_multiple_element_hash
-    assert_dom_equal(
-      " class=\"fancy\" onclick=\"alert('Hello World');\"",
-      option_html_attributes([ 'foo', 'bar', { :class => 'fancy', 'onclick' => "alert('Hello World');" } ])
-    )
+    output = option_html_attributes([ 'foo', 'bar', { :class => 'fancy', 'onclick' => "alert('Hello World');" } ])
+    assert output.include?(" class=\"fancy\"")
+    assert output.include?(" onclick=\"alert('Hello World');\"")
   end
 
   def test_option_html_attributes_with_multiple_hashes
-    assert_dom_equal(
-      " class=\"fancy\" onclick=\"alert('Hello World');\"",
-      option_html_attributes([ 'foo', 'bar', { :class => 'fancy' }, { 'onclick' => "alert('Hello World');" } ])
-    )
+    output = option_html_attributes([ 'foo', 'bar', { :class => 'fancy' }, { 'onclick' => "alert('Hello World');" } ])
+    assert output.include?(" class=\"fancy\"")
+    assert output.include?(" onclick=\"alert('Hello World');\"")
   end
 
   def test_option_html_attributes_with_special_characters