From: Tom Hughes <tom@compton.nu>
Date: Fri, 17 Aug 2012 21:57:58 +0000 (+0100)
Subject: Update tests for changes to HTML escaping in rails 3.2.8
X-Git-Tag: live~5472
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3ec1a05988e5dce0458cae7af3ed7d4cf26a468a

Update tests for changes to HTML escaping in rails 3.2.8
---

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 88c2aeb9a..d799ddf5a 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -190,7 +190,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+          assert_select "h2", :text => /#{entry.user.display_name}&#x27;s diary/, :count => 1
           assert_select "b", :text => /#{new_title}/, :count => 1
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
@@ -215,7 +215,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
+          assert_select "h2", :text => /#{users(:normal_user).display_name}&#x27;s diary/, :count => 1
           assert_select "b", :text => /#{new_title}/, :count => 1
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced