Update Potlatch 2 to 2.3-486-g109b096 build

[rails.git] / test / functional / diary_entry_controller_test.rb

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 724fb48a5a3387d828b4ef31bca3fdccafc6d6b6..d799ddf5a31cb48667f4aada35b0cde87ac58fab 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -104,7 +104,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "h1", "New Diary Entry", :count => 1
+          assert_select "h1", :text => "New Diary Entry", :count => 1
           # We don't care about the layout, we just care about the form fields
           # that are available
           assert_select "form[action='/diary/new']", :count => 1 do
@@ -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
@@ -235,7 +235,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
   def test_edit_diary_entry_i18n
     @request.cookies["_osm_username"] = users(:normal_user).display_name
 
-    get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end