X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/fdffd22ccadda9c4ed2a4332de4c3b7c77bae012..9dd82c96dd68071f2ca8bbbb762d2dcd5bc75413:/test/controllers/diary_entries_controller_test.rb?ds=inline

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 2b4230db7..255b43997 100644
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -1,9 +1,10 @@
 require "test_helper"
 
-class DiaryEntriesControllerTest < ActionController::TestCase
+class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
   include ActionView::Helpers::NumberHelper
 
   def setup
+    super
     # Create the default language for diary entries
     create(:language, :code => "en")
     # Stub nominatim response for diary entry locations
@@ -110,14 +111,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_new_no_login
     # Make sure that you are redirected to the login page when you
     # are not logged in
-    get :new
+    get new_diary_entry_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"
+    assert_redirected_to login_path(:referer => "/diary/new")
   end
 
   def test_new_form
     # Now try again when logged in
-    get :new, :session => { :user => create(:user) }
+    session_for(create(:user))
+    get new_diary_entry_path
     assert_response :success
     assert_select "title", :text => /New Diary Entry/, :count => 1
     assert_select "div.content-heading", :count => 1 do
@@ -140,12 +142,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
   def test_new_get_with_params
     # Now try creating a diary entry using get
+    session_for(create(:user))
     assert_difference "DiaryEntry.count", 0 do
-      get :new,
-          :params => { :commit => "save",
-                       :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
-                                         :longitude => "2.2", :language_code => "en" } },
-          :session => { :user => create(:user).id }
+      get new_diary_entry_path(:commit => "save",
+                               :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+                                                 :longitude => "2.2", :language_code => "en" })
     end
     assert_response :success
     assert_template :new
@@ -154,12 +155,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_create_no_body
     # Now try creating a invalid diary entry with an empty body
     user = create(:user)
+    session_for(user)
     assert_no_difference "DiaryEntry.count" do
-      post :create,
-           :params => { :commit => "save",
-                        :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1",
-                                          :longitude => "2.2", :language_code => "en" } },
-           :session => { :user => user.id }
+      post diary_entries_path(:commit => "save",
+                              :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1",
+                                                :longitude => "2.2", :language_code => "en" })
     end
     assert_response :success
     assert_template :new
@@ -170,12 +170,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_create
     # Now try creating a diary entry
     user = create(:user)
+    session_for(user)
     assert_difference "DiaryEntry.count", 1 do
-      post :create,
-           :params => { :commit => "save",
-                        :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
-                                          :longitude => "2.2", :language_code => "en" } },
-           :session => { :user => user.id }
+      post diary_entries_path(:commit => "save",
+                              :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+                                                :longitude => "2.2", :language_code => "en" })
     end
     assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
@@ -196,14 +195,13 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_create_german
     create(:language, :code => "de")
     user = create(:user)
+    session_for(user)
 
     # Now try creating a diary entry in a different language
     assert_difference "DiaryEntry.count", 1 do
-      post :create,
-           :params => { :commit => "save",
-                        :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
-                                          :longitude => "2.2", :language_code => "de" } },
-           :session => { :user => user.id }
+      post diary_entries_path(:commit => "save",
+                              :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
+                                                :longitude => "2.2", :language_code => "de" })
     end
     assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
@@ -223,16 +221,16 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
   def test_new_spammy
     user = create(:user)
+    session_for(user)
+
     # Generate some spammy content
     spammy_title = "Spam Spam Spam Spam Spam"
     spammy_body = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
 
     # Try creating a spammy diary entry
     assert_difference "DiaryEntry.count", 1 do
-      post :create,
-           :params => { :commit => "save",
-                        :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" } },
-           :session => { :user => user.id }
+      post diary_entries_path(:commit => "save",
+                              :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" })
     end
     assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
@@ -244,9 +242,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(user.id).status
 
     # Follow the redirect
-    get :index,
-        :params => { :display_name => user.display_name },
-        :session => { :user => user }
+    get diary_entries_path(:display_name => user.display_name)
     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :suspended
   end
@@ -259,33 +255,30 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # Make sure that you are redirected to the login page when you are
     # not logged in, without and with the id of the entry you want to edit
-    get :edit,
-        :params => { :display_name => entry.user.display_name, :id => entry.id }
+    get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+    assert_redirected_to login_path(:referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit")
 
-    # Verify that you get a not found error, when you pass a bogus id
-    get :edit,
-        :params => { :display_name => entry.user.display_name, :id => 9999 },
-        :session => { :user => entry.user }
-    assert_response :not_found
-    assert_select "div.content-heading", :count => 1 do
-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
-    end
+    session_for(other_user)
 
     # Verify that you get redirected to show if you are not the user
     # that created the entry
-    get :edit,
-        :params => { :display_name => entry.user.display_name, :id => entry.id },
-        :session => { :user => other_user }
+    get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
+    session_for(entry.user)
+
+    # Verify that you get a not found error, when you pass a bogus id
+    get edit_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
+    assert_response :not_found
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+    end
+
     # Now pass the id, and check that you can edit it, when using the same
     # user as the person who created the entry
-    get :edit,
-        :params => { :display_name => entry.user.display_name, :id => entry.id },
-        :session => { :user => entry.user }
+    get edit_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_select "title", :text => /Edit Diary Entry/, :count => 1
     assert_select "div.content-heading", :count => 1 do
@@ -311,18 +304,14 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     new_latitude = "1.1"
     new_longitude = "2.2"
     new_language_code = "en"
-    put :update,
-        :params => { :display_name => entry.user.display_name, :id => entry.id, :commit => "save",
-                     :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
-                                       :longitude => new_longitude, :language_code => new_language_code } },
-        :session => { :user => entry.user.id }
+    put diary_entry_path(:display_name => entry.user.display_name, :id => entry, :commit => "save",
+                         :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
+                                           :longitude => new_longitude, :language_code => new_language_code })
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     # Now check that the new data is rendered, when logged in
-    get :show,
-        :params => { :display_name => entry.user.display_name, :id => entry.id },
-        :session => { :user => entry.user }
+    get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"
     assert_select "title", :text => /Users' diaries | /, :count => 1
@@ -341,9 +330,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     end
 
     # and when not logged in as the user who wrote the entry
-    get :show,
-        :params => { :display_name => entry.user.display_name, :id => entry.id },
-        :session => { :user => create(:user) }
+    session_for(create(:user))
+    get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_template "show"
     assert_select "title", :text => /Users' diaries | /, :count => 1
@@ -364,9 +352,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_edit_i18n
     user = create(:user)
     diary_entry = create(:diary_entry, :language_code => "en", :user => user)
-    get :edit,
-        :params => { :display_name => user.display_name, :id => diary_entry.id },
-        :session => { :user => user }
+    session_for(user)
+    get edit_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end
@@ -375,33 +362,27 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     user = create(:user)
     other_user = create(:user)
     entry = create(:diary_entry, :user => user)
+    create(:diary_entry_subscription, :diary_entry => entry, :user => user)
 
     # Make sure that you are denied when you are not logged in
-    post :comment,
-         :params => { :display_name => entry.user.display_name, :id => entry.id }
+    post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :forbidden
 
+    session_for(other_user)
+
     # Verify that you get a not found error, when you pass a bogus id
-    post :comment,
-         :params => { :display_name => entry.user.display_name, :id => 9999 },
-         :session => { :user => other_user }
+    post comment_diary_entry_path(:display_name => entry.user.display_name, :id => 9999)
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
       assert_select "h2", :text => "No entry with the id: 9999", :count => 1
     end
 
-    post :subscribe,
-         :params => { :id => entry.id, :display_name => entry.user.display_name },
-         :session => { :user => user }
-
     # Now try an invalid comment with an empty body
     assert_no_difference "ActionMailer::Base.deliveries.size" do
       assert_no_difference "DiaryComment.count" do
         assert_no_difference "entry.subscribers.count" do
           perform_enqueued_jobs do
-            post :comment,
-                 :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "" } },
-                 :session => { :user => other_user }
+            post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => "" })
           end
         end
       end
@@ -414,9 +395,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
       assert_difference "DiaryComment.count", 1 do
         assert_difference "entry.subscribers.count", 1 do
           perform_enqueued_jobs do
-            post :comment,
-                 :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => "New comment" } },
-                 :session => { :user => other_user }
+            post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => "New comment" })
           end
         end
       end
@@ -435,8 +414,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "New comment", comment.body
 
     # Now show the diary entry, and check the new comment is present
-    get :show,
-        :params => { :display_name => entry.user.display_name, :id => entry.id }
+    get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_select ".diary-comment", :count => 1 do
       assert_select "#comment#{comment.id}", :count => 1 do
@@ -449,12 +427,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_comment_spammy
     user = create(:user)
     other_user = create(:user)
-
-    # Find the entry to comment on
     entry = create(:diary_entry, :user => user)
-    post :subscribe,
-         :params => { :id => entry.id, :display_name => entry.user.display_name },
-         :session => { :user => user }
+    create(:diary_entry_subscription, :diary_entry => entry, :user => user)
+
+    session_for(other_user)
 
     # Generate some spammy content
     spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")
@@ -463,9 +439,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "DiaryComment.count", 1 do
         perform_enqueued_jobs do
-          post :comment,
-               :params => { :display_name => entry.user.display_name, :id => entry.id, :diary_comment => { :body => spammy_text } },
-               :session => { :user => other_user }
+          post comment_diary_entry_path(:display_name => entry.user.display_name, :id => entry, :diary_comment => { :body => spammy_text })
         end
       end
     end
@@ -484,15 +458,12 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(other_user.id).status
 
     # Follow the redirect
-    get :index,
-        :params => { :display_name => user.display_name },
-        :session => { :user => other_user }
+    get diary_entries_path(:display_name => user.display_name)
     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :suspended
 
     # Now show the diary entry, and check the new comment is not present
-    get :show,
-        :params => { :display_name => entry.user.display_name, :id => entry.id }
+    get diary_entry_path(:display_name => entry.user.display_name, :id => entry)
     assert_response :success
     assert_select ".diary-comment", :count => 0
   end
@@ -503,7 +474,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     public_entry = create(:diary_entry, :user => create(:user))
 
     # Try a list of all diary entries
-    get :index
+    get diary_entries_path
     check_diary_index diary_entry, geo_entry, public_entry
   end
 
@@ -516,11 +487,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for a valid user
-    get :index, :params => { :display_name => user.display_name }
+    get diary_entries_path(:display_name => user.display_name)
     check_diary_index diary_entry, geo_entry
 
     # Try a list of diary entries for an invalid user
-    get :index, :params => { :display_name => "No Such User" }
+    get diary_entries_path(:display_name => "No Such User")
     assert_response :not_found
     assert_template "users/no_such_user"
   end
@@ -528,19 +499,21 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_index_friends
     user = create(:user)
     other_user = create(:user)
-    friend = create(:friend, :befriender => user)
-    diary_entry = create(:diary_entry, :user => friend.befriendee)
+    friendship = create(:friendship, :befriender => user)
+    diary_entry = create(:diary_entry, :user => friendship.befriendee)
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for your friends when not logged in
-    get :index, :params => { :friends => true }
+    get friends_diary_entries_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"
+    assert_redirected_to login_path(:referer => "/diary/friends")
 
     # Try a list of diary entries for your friends when logged in
-    get :index, :params => { :friends => true }, :session => { :user => user }
+    session_for(user)
+    get friends_diary_entries_path
     check_diary_index diary_entry
-    get :index, :params => { :friends => true }, :session => { :user => other_user }
+    session_for(other_user)
+    get friends_diary_entries_path
     check_diary_index
   end
 
@@ -551,14 +524,16 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     diary_entry = create(:diary_entry, :user => user)
 
     # Try a list of diary entries for nearby users when not logged in
-    get :index, :params => { :nearby => true }
+    get nearby_diary_entries_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"
+    assert_redirected_to login_path(:referer => "/diary/nearby")
 
     # Try a list of diary entries for nearby users when logged in
-    get :index, :params => { :nearby => true }, :session => { :user => nearby_user }
+    session_for(nearby_user)
+    get nearby_diary_entries_path
     check_diary_index diary_entry
-    get :index, :params => { :nearby => true }, :session => { :user => user }
+    session_for(user)
+    get nearby_diary_entries_path
     check_diary_index
   end
 
@@ -570,15 +545,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     diary_entry_de = create(:diary_entry, :language_code => "de")
 
     # Try a list of diary entries in english
-    get :index, :params => { :language => "en" }
+    get diary_entries_path(:language => "en")
     check_diary_index diary_entry_en, diary_entry_en2
 
     # Try a list of diary entries in german
-    get :index, :params => { :language => "de" }
+    get diary_entries_path(:language => "de")
     check_diary_index diary_entry_de
 
     # Try a list of diary entries in slovenian
-    get :index, :params => { :language => "sl" }
+    get diary_entries_path(:language => "sl")
     check_diary_index
   end
 
@@ -587,12 +562,12 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create_list(:diary_entry, 50)
 
     # Try and get the index
-    get :index
+    get diary_entries_path
     assert_response :success
     assert_select "div.diary_post", :count => 20
 
     # Try and get the second page
-    get :index, :params => { :page => 2 }
+    get diary_entries_path(:page => 2)
     assert_response :success
     assert_select "div.diary_post", :count => 20
   end
@@ -603,7 +578,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
 
-    get :rss, :params => { :format => :rss }
+    get diary_rss_path
     assert_response :success, "Should be able to get a diary RSS"
     assert_select "rss", :count => 1 do
       assert_select "channel", :count => 1 do
@@ -620,7 +595,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
 
-    get :rss, :params => { :language => "en", :format => :rss }
+    get diary_rss_path(:language => "en")
     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by language"
   end
@@ -634,7 +609,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:language, :code => "sl")
     create(:diary_entry, :language_code => "en")
 
-    get :rss, :params => { :language => "sl", :format => :rss }
+    get diary_rss_path(:language => "sl")
     assert_response :success, "Should be able to get a specific language diary RSS"
     assert_select "rss>channel>item", :count => 0 # , "Diary entries should be filtered by language"
   end
@@ -646,28 +621,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :user => user)
     create(:diary_entry, :user => other_user)
 
-    get :rss, :params => { :display_name => user.display_name, :format => :rss }
+    get diary_rss_path(:display_name => user.display_name)
     assert_response :success, "Should be able to get a specific users diary RSS"
     assert_select "rss>channel>item", :count => 2 # , "Diary entries should be filtered by user"
   end
 
   def test_rss_nonexisting_user
     # Try a user that has never existed
-    get :rss, :params => { :display_name => "fakeUsername76543", :format => :rss }
+    get diary_rss_path(:display_name => "fakeUsername76543")
     assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
 
     # Try a suspended user
-    get :rss, :params => { :display_name => create(:user, :suspended).display_name, :format => :rss }
+    get diary_rss_path(:display_name => create(:user, :suspended).display_name)
     assert_response :not_found, "Should not be able to get a suspended users diary RSS"
 
     # Try a deleted user
-    get :rss, :params => { :display_name => create(:user, :deleted).display_name, :format => :rss }
+    get diary_rss_path(:display_name => create(:user, :deleted).display_name)
     assert_response :not_found, "Should not be able to get a deleted users diary RSS"
   end
 
   def test_rss_character_escaping
     create(:diary_entry, :title => "<script>")
-    get :rss, :params => { :format => :rss }
+    get diary_rss_path
 
     assert_match "<title>&lt;script&gt;</title>", response.body
   end
@@ -675,11 +650,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_feed_delay
     create(:diary_entry, :created_at => 7.hours.ago)
     create(:diary_entry, :created_at => 5.hours.ago)
-    get :rss, :params => { :format => :rss }
+    get diary_rss_path
     assert_select "rss>channel>item", :count => 2
 
     with_diary_feed_delay(6) do
-      get :rss, :params => { :format => :rss }
+      get diary_rss_path
       assert_select "rss>channel>item", :count => 1
     end
   end
@@ -691,23 +666,23 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # Try a normal entry that should work
     diary_entry = create(:diary_entry, :user => user)
-    get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
+    get diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :success
     assert_template :show
 
     # Try a deleted entry
     diary_entry_deleted = create(:diary_entry, :user => user, :visible => false)
-    get :show, :params => { :display_name => user.display_name, :id => diary_entry_deleted.id }
+    get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted)
     assert_response :not_found
 
     # Try an entry by a suspended user
     diary_entry_suspended = create(:diary_entry, :user => suspended_user)
-    get :show, :params => { :display_name => suspended_user.display_name, :id => diary_entry_suspended.id }
+    get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended)
     assert_response :not_found
 
     # Try an entry by a deleted user
     diary_entry_deleted = create(:diary_entry, :user => deleted_user)
-    get :show, :params => { :display_name => deleted_user.display_name, :id => diary_entry_deleted.id }
+    get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted)
     assert_response :not_found
   end
 
@@ -720,7 +695,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     deleted_user_comment = create(:diary_comment, :diary_entry => diary_entry, :user => create(:user, :deleted))
     hidden_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
 
-    get :show, :params => { :display_name => user.display_name, :id => diary_entry.id }
+    get diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :success
     assert_template :show
     assert_select "div.comments" do
@@ -733,29 +708,36 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
   def test_hide
     user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
 
     # Try without logging in
-    diary_entry = create(:diary_entry, :user => user)
-    post :hide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id }
+    post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :forbidden
-    assert_equal true, DiaryEntry.find(diary_entry.id).visible
+    assert DiaryEntry.find(diary_entry.id).visible
 
     # Now try as a normal user
-    post :hide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => user }
+    session_for(user)
+    post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_equal true, DiaryEntry.find(diary_entry.id).visible
+    assert DiaryEntry.find(diary_entry.id).visible
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
+    assert_response :redirect
+    assert_redirected_to :action => :index, :display_name => user.display_name
+    assert_not DiaryEntry.find(diary_entry.id).visible
+
+    # Reset
+    diary_entry.reload.update(:visible => true)
 
     # Finally try as an administrator
-    post :hide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => create(:administrator_user) }
+    session_for(create(:administrator_user))
+    post hide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
-    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+    assert_not DiaryEntry.find(diary_entry.id).visible
   end
 
   def test_unhide
@@ -763,82 +745,97 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # Try without logging in
     diary_entry = create(:diary_entry, :user => user, :visible => false)
-    post :unhide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id }
+    post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :forbidden
-    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+    assert_not DiaryEntry.find(diary_entry.id).visible
 
     # Now try as a normal user
-    post :unhide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => user }
+    session_for(user)
+    post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
+    assert_not DiaryEntry.find(diary_entry.id).visible
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+    assert_not DiaryEntry.find(diary_entry.id).visible
 
     # Finally try as an administrator
-    post :unhide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => create(:administrator_user) }
+    session_for(create(:administrator_user))
+    post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
     assert_response :redirect
     assert_redirected_to :action => :index, :display_name => user.display_name
-    assert_equal true, DiaryEntry.find(diary_entry.id).visible
+    assert DiaryEntry.find(diary_entry.id).visible
   end
 
   def test_hidecomment
     user = create(:user)
-    administrator_user = create(:administrator_user)
     diary_entry = create(:diary_entry, :user => user)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)
+
     # Try without logging in
-    post :hidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }
+    post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :forbidden
-    assert_equal true, DiaryComment.find(diary_comment.id).visible
+    assert DiaryComment.find(diary_comment.id).visible
 
     # Now try as a normal user
-    post :hidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
-         :session => { :user => user }
+    session_for(user)
+    post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_equal true, DiaryComment.find(diary_comment.id).visible
+    assert DiaryComment.find(diary_comment.id).visible
+
+    # Try as a moderator
+    session_for(create(:moderator_user))
+    post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+    assert_not DiaryComment.find(diary_comment.id).visible
+
+    # Reset
+    diary_comment.reload.update(:visible => true)
 
     # Finally try as an administrator
-    post :hidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
-         :session => { :user => administrator_user }
+    session_for(create(:administrator_user))
+    post hide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
-    assert_equal false, DiaryComment.find(diary_comment.id).visible
+    assert_not DiaryComment.find(diary_comment.id).visible
   end
 
   def test_unhidecomment
     user = create(:user)
-    administrator_user = create(:administrator_user)
     diary_entry = create(:diary_entry, :user => user)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)
+
     # Try without logging in
-    post :unhidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id }
+    post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :forbidden
-    assert_equal false, DiaryComment.find(diary_comment.id).visible
+    assert_not DiaryComment.find(diary_comment.id).visible
 
     # Now try as a normal user
-    post :unhidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
-         :session => { :user => user }
+    session_for(user)
+    post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
+    assert_not DiaryComment.find(diary_comment.id).visible
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :redirect
     assert_redirected_to :controller => :errors, :action => :forbidden
-    assert_equal false, DiaryComment.find(diary_comment.id).visible
+    assert_not DiaryComment.find(diary_comment.id).visible
 
     # Finally try as an administrator
-    post :unhidecomment,
-         :params => { :display_name => user.display_name, :id => diary_entry.id, :comment => diary_comment.id },
-         :session => { :user => administrator_user }
+    session_for(create(:administrator_user))
+    post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
     assert_response :redirect
     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
-    assert_equal true, DiaryComment.find(diary_comment.id).visible
+    assert DiaryComment.find(diary_comment.id).visible
   end
 
   def test_comments
@@ -846,30 +843,29 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     other_user = create(:user)
     suspended_user = create(:user, :suspended)
     deleted_user = create(:user, :deleted)
+
     # Test a user with no comments
-    get :comments, :params => { :display_name => user.display_name }
+    get diary_comments_path(:display_name => user.display_name)
     assert_response :success
     assert_template :comments
-    assert_select "table.messages" do
-      assert_select "tr", :count => 1 # header, no comments
-    end
+    assert_select "h4", :html => "No diary comments"
 
     # Test a user with a comment
     create(:diary_comment, :user => other_user)
 
-    get :comments, :params => { :display_name => other_user.display_name }
+    get diary_comments_path(:display_name => other_user.display_name)
     assert_response :success
     assert_template :comments
-    assert_select "table.messages" do
+    assert_select "table.table-striped" do
       assert_select "tr", :count => 2 # header and one comment
     end
 
     # Test a suspended user
-    get :comments, :params => { :display_name => suspended_user.display_name }
+    get diary_comments_path(:display_name => suspended_user.display_name)
     assert_response :not_found
 
     # Test a deleted user
-    get :comments, :params => { :display_name => deleted_user.display_name }
+    get diary_comments_path(:display_name => deleted_user.display_name)
     assert_response :not_found
   end
 
@@ -878,10 +874,9 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     other_user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
 
+    session_for(other_user)
     assert_difference "diary_entry.subscribers.count", 1 do
-      post :subscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-           :session => { :user => other_user }
+      post diary_entry_subscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
     assert_response :redirect
   end
@@ -894,25 +889,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do
-      post :subscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name }
+      post diary_entry_subscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
     assert_response :forbidden
 
+    session_for(other_user)
+
     # bad diary id
-    post :subscribe,
-         :params => { :id => 999111, :display_name => "username" },
-         :session => { :user => other_user }
+    post diary_entry_subscribe_path(:id => 999111, :display_name => "username")
     assert_response :not_found
 
     # trying to subscribe when already subscribed
-    post :subscribe,
-         :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-         :session => { :user => other_user }
+    post diary_entry_subscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     assert_no_difference "diary_entry.subscribers.count" do
-      post :subscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-           :session => { :user => other_user }
+      post diary_entry_subscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
   end
 
@@ -921,14 +911,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     other_user = create(:user)
 
     diary_entry = create(:diary_entry, :user => user)
+    create(:diary_entry_subscription, :diary_entry => diary_entry, :user => other_user)
 
-    post :subscribe,
-         :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-         :session => { :user => other_user }
+    session_for(other_user)
     assert_difference "diary_entry.subscribers.count", -1 do
-      post :unsubscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-           :session => { :user => other_user }
+      post diary_entry_unsubscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
     assert_response :redirect
   end
@@ -941,22 +928,19 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do
-      post :unsubscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name }
+      post diary_entry_unsubscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
     assert_response :forbidden
 
+    session_for(other_user)
+
     # bad diary id
-    post :unsubscribe,
-         :params => { :id => 999111, :display_name => "username" },
-         :session => { :user => other_user }
+    post diary_entry_unsubscribe_path(:id => 999111, :display_name => "username")
     assert_response :not_found
 
     # trying to unsubscribe when not subscribed
     assert_no_difference "diary_entry.subscribers.count" do
-      post :unsubscribe,
-           :params => { :id => diary_entry.id, :display_name => diary_entry.user.display_name },
-           :session => { :user => other_user }
+      post diary_entry_unsubscribe_path(:id => diary_entry, :display_name => diary_entry.user.display_name)
     end
   end