Reload only changeset element subpages

[rails.git] / test / controllers / diary_entries_controller_test.rb

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 2b4230db7a41cfbfdf92cb4a6bcd73fcc611900c..d13a50163ea8bc59e15af03885e25385379ac71a 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -1,9 +1,10 @@
 require "test_helper"
 
 require "test_helper"
 

-class DiaryEntriesControllerTest < ActionController::TestCase
+class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest

   include ActionView::Helpers::NumberHelper
 
   def setup
   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
     # Create the default language for diary entries
     create(:language, :code => "en")
     # Stub nominatim response for diary entry locations


@@ -52,10 +53,6 @@ class DiaryEntriesControllerTest < ActionController::TestCase
       { :path => "/user/username/diary/comments", :method => :get },
       { :controller => "diary_entries", :action => "comments", :display_name => "username" }
     )
       { :path => "/user/username/diary/comments", :method => :get },
       { :controller => "diary_entries", :action => "comments", :display_name => "username" }
     )

-    assert_routing(
-      { :path => "/user/username/diary/comments/1", :method => :get },
-      { :controller => "diary_entries", :action => "comments", :display_name => "username", :page => "1" }
-    )

 
     assert_routing(
       { :path => "/diary/new", :method => :get },
 
     assert_routing(
       { :path => "/diary/new", :method => :get },


@@ -97,27 +94,38 @@ class DiaryEntriesControllerTest < ActionController::TestCase
       { :path => "/user/username/diary/1/unhidecomment/2", :method => :post },
       { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" }
     )
       { :path => "/user/username/diary/1/unhidecomment/2", :method => :post },
       { :controller => "diary_entries", :action => "unhidecomment", :display_name => "username", :id => "1", :comment => "2" }
     )

+    assert_routing(
+      { :path => "/user/username/diary/1/subscribe", :method => :get },
+      { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
+    )

     assert_routing(
       { :path => "/user/username/diary/1/subscribe", :method => :post },
       { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
     )
     assert_routing(
       { :path => "/user/username/diary/1/subscribe", :method => :post },
       { :controller => "diary_entries", :action => "subscribe", :display_name => "username", :id => "1" }
     )

+    assert_routing(
+      { :path => "/user/username/diary/1/unsubscribe", :method => :get },
+      { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
+    )

     assert_routing(
       { :path => "/user/username/diary/1/unsubscribe", :method => :post },
       { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
     )
     assert_routing(
       { :path => "/user/username/diary/1/unsubscribe", :method => :post },
       { :controller => "diary_entries", :action => "unsubscribe", :display_name => "username", :id => "1" }
     )

+
+    get "/user/username/diary/comments/1"
+    assert_redirected_to "/user/username/diary/comments"

   end
 
   def test_new_no_login
     # Make sure that you are redirected to the login page when you
     # are not logged in
   end
 
   def test_new_no_login
     # Make sure that you are redirected to the login page when you
     # are not logged in

-    get :new
-    assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/new"
+    get new_diary_entry_path
+    assert_redirected_to login_path(:referer => "/diary/new")

   end
 
   def test_new_form
     # Now try again when logged in
   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
     assert_response :success
     assert_select "title", :text => /New Diary Entry/, :count => 1
     assert_select "div.content-heading", :count => 1 do


@@ -133,19 +141,18 @@ class DiaryEntriesControllerTest < ActionController::TestCase
         assert_select "input[name=commit][type=submit][value=Publish]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
         assert_select "input[name=commit][type=submit][value=Publish]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1

-        assert_select "input", :count => 7
+        assert_select "input", :count => 6

       end
     end
   end
 
   def test_new_get_with_params
     # Now try creating a diary entry using get
       end
     end
   end
 
   def test_new_get_with_params
     # Now try creating a diary entry using get

+    session_for(create(:user))

     assert_difference "DiaryEntry.count", 0 do
     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
     end
     assert_response :success
     assert_template :new


@@ -154,30 +161,27 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_create_no_body
     # Now try creating a invalid diary entry with an empty body
     user = create(:user)
   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
     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
 
     end
     assert_response :success
     assert_template :new
 

-    assert_nil UserPreference.where(:user_id => user.id, :k => "diary.default_language").first
+    assert_nil UserPreference.find_by(:user => user, :k => "diary.default_language")

   end
 
   def test_create
     # Now try creating a diary entry
     user = create(:user)
   end
 
   def test_create
     # Now try creating a diary entry
     user = create(:user)

+    session_for(user)

     assert_difference "DiaryEntry.count", 1 do
     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
     end

-    assert_response :redirect

     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id


@@ -190,22 +194,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     # checks if user was subscribed
     assert_equal 1, entry.subscribers.length
 
     # checks if user was subscribed
     assert_equal 1, entry.subscribers.length
 

-    assert_equal "en", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v
+    assert_equal "en", UserPreference.find_by(:user => user, :k => "diary.default_language").v

   end
 
   def test_create_german
     create(:language, :code => "de")
     user = create(:user)
   end
 
   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
 
     # 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
     end

-    assert_response :redirect

     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id


@@ -218,23 +220,22 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     # checks if user was subscribed
     assert_equal 1, entry.subscribers.length
 
     # checks if user was subscribed
     assert_equal 1, entry.subscribers.length
 

-    assert_equal "de", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v
+    assert_equal "de", UserPreference.find_by(:user => user, :k => "diary.default_language").v

   end
 
   def test_new_spammy
     user = create(:user)
   end
 
   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
     # 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
     end

-    assert_response :redirect

     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id
     assert_redirected_to :action => :index, :display_name => user.display_name
     entry = DiaryEntry.order(:id).last
     assert_equal user.id, entry.user_id


@@ -244,10 +245,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(user.id).status
 
     # Follow the redirect
     assert_equal "suspended", User.find(user.id).status
 
     # Follow the redirect

-    get :index,
-        :params => { :display_name => user.display_name },
-        :session => { :user => user }
-    assert_response :redirect
+    get diary_entries_path(:display_name => user.display_name)

     assert_redirected_to :controller => :users, :action => :suspended
   end
 
     assert_redirected_to :controller => :users, :action => :suspended
   end
 


@@ -259,33 +257,28 @@ 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
 
     # 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 }
-    assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit"
+    get edit_diary_entry_path(entry.user, entry)
+    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
 
     # 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 }
-    assert_response :redirect
+    get edit_diary_entry_path(entry.user, entry)

     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
 
     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(entry.user, :id => 9999)
+    assert_response :not_found
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h1", :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
     # 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(entry.user, entry)

     assert_response :success
     assert_select "title", :text => /Edit Diary Entry/, :count => 1
     assert_select "div.content-heading", :count => 1 do
     assert_response :success
     assert_select "title", :text => /Edit Diary Entry/, :count => 1
     assert_select "div.content-heading", :count => 1 do


@@ -301,7 +294,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
         assert_select "input[name=commit][type=submit][value=Update]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
         assert_select "input[name=commit][type=submit][value=Update]", :count => 1
         assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
         assert_select "input[name=commit][type=submit][value=Preview]", :count => 1

-        assert_select "input", :count => 8
+        assert_select "input", :count => 7

       end
     end
 
       end
     end
 


@@ -311,47 +304,40 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     new_latitude = "1.1"
     new_longitude = "2.2"
     new_language_code = "en"
     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 }
-    assert_response :redirect
+    put diary_entry_path(entry.user, entry, :commit => "save",
+                                            :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
+                                                              :longitude => new_longitude, :language_code => new_language_code })

     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
     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(entry.user, entry)

     assert_response :success
     assert_template "show"
     assert_response :success
     assert_template "show"

-    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "title", :text => /Users' Diaries | /, :count => 1

     assert_select "div.content-heading", :count => 1 do
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
     end
     assert_select "div#content", :count => 1 do

-      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      assert_select "h2", :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
       assert_select "p", :text => /#{new_body}/, :count => 1
       assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
       # As we're not logged in, check that you cannot edit
       # This next line won't work if the text has been run through the htmlize function
       # due to formatting that could be introduced
       assert_select "p", :text => /#{new_body}/, :count => 1
       assert_select "abbr[class='geo'][title='#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}']", :count => 1
       # As we're not logged in, check that you cannot edit

-      # print @response.body

       assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
     end
 
     # and when not logged in as the user who wrote the entry
       assert_select "a[href='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
     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(entry.user, entry)

     assert_response :success
     assert_template "show"
     assert_response :success
     assert_template "show"

-    assert_select "title", :text => /Users' diaries | /, :count => 1
+    assert_select "title", :text => /Users' Diaries | /, :count => 1

     assert_select "div.content-heading", :count => 1 do
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
+      assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
     end
     assert_select "div#content", :count => 1 do

-      assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
+      assert_select "h2", :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
       assert_select "p", :text => /#{new_body}/, :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
       assert_select "p", :text => /#{new_body}/, :count => 1


@@ -364,9 +350,8 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_edit_i18n
     user = create(:user)
     diary_entry = create(:diary_entry, :language_code => "en", :user => user)
   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(user, diary_entry)

     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end


@@ -375,33 +360,27 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     user = create(:user)
     other_user = create(:user)
     entry = create(:diary_entry, :user => user)
     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
 
     # 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(entry.user, entry)

     assert_response :forbidden
 
     assert_response :forbidden
 

+    session_for(other_user)
+

     # Verify that you get a not found error, when you pass a bogus id
     # 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(entry.user, :id => 9999)

     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do
     assert_response :not_found
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => "No entry with the id: 9999", :count => 1
+      assert_select "h1", :text => "No entry with the id: 9999", :count => 1

     end
 
     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
     # 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(entry.user, entry, :diary_comment => { :body => "" })

           end
         end
       end
           end
         end
       end


@@ -414,14 +393,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
       assert_difference "DiaryComment.count", 1 do
         assert_difference "entry.subscribers.count", 1 do
           perform_enqueued_jobs do
       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(entry.user, entry, :diary_comment => { :body => "New comment" })

           end
         end
       end
     end
           end
         end
       end
     end

-    assert_response :redirect

     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to


@@ -435,8 +411,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "New comment", comment.body
 
     # Now show the diary entry, and check the new comment is present
     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(entry.user, entry)

     assert_response :success
     assert_select ".diary-comment", :count => 1 do
       assert_select "#comment#{comment.id}", :count => 1 do
     assert_response :success
     assert_select ".diary-comment", :count => 1 do
       assert_select "#comment#{comment.id}", :count => 1 do


@@ -449,12 +424,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_comment_spammy
     user = create(:user)
     other_user = create(:user)
   def test_comment_spammy
     user = create(:user)
     other_user = create(:user)

-
-    # Find the entry to comment on

     entry = create(:diary_entry, :user => user)
     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(" ")
 
     # Generate some spammy content
     spammy_text = 1.upto(50).map { |n| "http://example.com/spam#{n}" }.join(" ")


@@ -463,13 +436,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_difference "ActionMailer::Base.deliveries.size", 1 do
       assert_difference "DiaryComment.count", 1 do
         perform_enqueued_jobs do
     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(entry.user, entry, :diary_comment => { :body => spammy_text })

         end
       end
     end
         end
       end
     end

-    assert_response :redirect

     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to
     assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
     email = ActionMailer::Base.deliveries.first
     assert_equal [user.email], email.to


@@ -484,15 +454,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal "suspended", User.find(other_user.id).status
 
     # Follow the redirect
     assert_equal "suspended", User.find(other_user.id).status
 
     # Follow the redirect

-    get :index,
-        :params => { :display_name => user.display_name },
-        :session => { :user => other_user }
-    assert_response :redirect
+    get diary_entries_path(:display_name => user.display_name)

     assert_redirected_to :controller => :users, :action => :suspended
 
     # Now show the diary entry, and check the new comment is not present
     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(entry.user, entry)

     assert_response :success
     assert_select ".diary-comment", :count => 0
   end
     assert_response :success
     assert_select ".diary-comment", :count => 0
   end


@@ -503,7 +469,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     public_entry = create(:diary_entry, :user => create(:user))
 
     # Try a list of all diary entries
     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
 
     check_diary_index diary_entry, geo_entry, public_entry
   end
 


@@ -516,11 +482,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     _other_entry = create(:diary_entry, :user => other_user)
 
     # Try a list of diary entries for a valid user
     _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
     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
     assert_response :not_found
     assert_template "users/no_such_user"
   end


@@ -528,19 +494,20 @@ class DiaryEntriesControllerTest < ActionController::TestCase
   def test_index_friends
     user = create(:user)
     other_user = create(:user)
   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
     _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 }
-    assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/friends"
+    get friends_diary_entries_path
+    assert_redirected_to login_path(:referer => "/diary/friends")

 
     # Try a list of diary entries for your friends when logged in
 
     # 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
     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
 
     check_diary_index
   end
 


@@ -551,14 +518,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     diary_entry = create(:diary_entry, :user => user)
 
     # Try a list of diary entries for nearby users when not logged in
     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 }
-    assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => "/diary/nearby"
+    get nearby_diary_entries_path
+    assert_redirected_to login_path(:referer => "/diary/nearby")

 
     # Try a list of diary entries for nearby users when logged in
 
     # 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
     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
 
     check_diary_index
   end
 


@@ -570,15 +538,15 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     diary_entry_de = create(:diary_entry, :language_code => "de")
 
     # Try a list of diary entries in english
     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
     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
     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
 
     check_diary_index
   end
 


@@ -587,14 +555,50 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create_list(:diary_entry, 50)
 
     # Try and get the index
     create_list(:diary_entry, 50)
 
     # Try and get the index

-    get :index
+    get diary_entries_path

     assert_response :success
     assert_response :success

-    assert_select "div.diary_post", :count => 20
+    assert_select "article.diary_post", :count => 20
+    assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+    assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1

 
     # Try and get the second page
 
     # Try and get the second page

-    get :index, :params => { :page => 2 }
+    get css_select("li.page-item .page-link").last["href"]
+    assert_response :success
+    assert_select "article.diary_post", :count => 20
+    assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+    assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+    # Try and get the third page
+    get css_select("li.page-item .page-link").last["href"]
+    assert_response :success
+    assert_select "article.diary_post", :count => 10
+    assert_select "li.page-item.disabled span.page-link", :text => "Older Entries", :count => 1
+    assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+    # Go back to the second page
+    get css_select("li.page-item .page-link").first["href"]

     assert_response :success
     assert_response :success

-    assert_select "div.diary_post", :count => 20
+    assert_select "article.diary_post", :count => 20
+    assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+    assert_select "li.page-item a.page-link", :text => "Newer Entries", :count => 1
+
+    # Go back to the first page
+    get css_select("li.page-item .page-link").first["href"]
+    assert_response :success
+    assert_select "article.diary_post", :count => 20
+    assert_select "li.page-item a.page-link", :text => "Older Entries", :count => 1
+    assert_select "li.page-item.disabled span.page-link", :text => "Newer Entries", :count => 1
+  end
+
+  def test_index_invalid_paged
+    # Try some invalid paged accesses
+    %w[-1 0 fred].each do |id|
+      get diary_entries_path(:before => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+
+      get diary_entries_path(:after => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+    end

   end
 
   def test_rss
   end
 
   def test_rss


@@ -603,7 +607,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
 
     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
     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 +624,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :language_code => "en")
     create(:diary_entry, :language_code => "de")
 
     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
     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 +638,7 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:language, :code => "sl")
     create(:diary_entry, :language_code => "en")
 
     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
     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 +650,28 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     create(:diary_entry, :user => user)
     create(:diary_entry, :user => other_user)
 
     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
     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
     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
     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>")
     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
 
     assert_match "<title>&lt;script&gt;</title>", response.body
   end


@@ -675,11 +679,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)
   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
 
     assert_select "rss>channel>item", :count => 2
 

-    with_diary_feed_delay(6) do
-      get :rss, :params => { :format => :rss }
+    with_settings(:diary_feed_delay => 6) do
+      get diary_rss_path

       assert_select "rss>channel>item", :count => 1
     end
   end
       assert_select "rss>channel>item", :count => 1
     end
   end


@@ -691,24 +695,41 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # Try a normal entry that should work
     diary_entry = create(:diary_entry, :user => user)
 
     # 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(user, diary_entry)

     assert_response :success
     assert_template :show
 
     assert_response :success
     assert_template :show
 

+    # Try a non-integer ID
+    get "/user/#{CGI.escape(user.display_name)}/diary/#{diary_entry.id})"
+    assert_response :not_found
+    assert_template "rescues/routing_error"
+

     # Try a deleted entry
     diary_entry_deleted = create(:diary_entry, :user => user, :visible => false)
     # 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(user, diary_entry_deleted)

     assert_response :not_found
 
     # Try an entry by a suspended user
     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 }
+    diary_entry_suspended_user = create(:diary_entry, :user => suspended_user)
+    get diary_entry_path(suspended_user, diary_entry_suspended_user)

     assert_response :not_found
 
     # Try an entry by a deleted user
     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 }
+    diary_entry_deleted_user = create(:diary_entry, :user => deleted_user)
+    get diary_entry_path(deleted_user, diary_entry_deleted_user)

     assert_response :not_found
     assert_response :not_found

+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    get diary_entry_path(user, diary_entry_deleted)
+    assert_response :success
+    assert_template :show
+
+    # Finally try as an administrator
+    session_for(create(:administrator_user))
+    get diary_entry_path(user, diary_entry_deleted)
+    assert_response :success
+    assert_template :show

   end
 
   def test_show_hidden_comments
   end
 
   def test_show_hidden_comments


@@ -720,7 +741,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)
 
     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(user, diary_entry)

     assert_response :success
     assert_template :show
     assert_select "div.comments" do
     assert_response :success
     assert_template :show
     assert_select "div.comments" do


@@ -733,29 +754,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
   def test_hide
     user = create(:user)
 
   def test_hide
     user = create(:user)

+    diary_entry = create(:diary_entry, :user => user)

 
     # Try without logging in
 
     # 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(user, diary_entry)

     assert_response :forbidden
     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
 
     # Now try as a normal user

-    post :hide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => user }
-    assert_response :redirect
+    session_for(user)
+    post hide_diary_entry_path(user, diary_entry)

     assert_redirected_to :controller => :errors, :action => :forbidden
     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(user, diary_entry)
+    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
 
     # Finally try as an administrator

-    post :hide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => create(:administrator_user) }
-    assert_response :redirect
+    session_for(create(:administrator_user))
+    post hide_diary_entry_path(user, diary_entry)

     assert_redirected_to :action => :index, :display_name => user.display_name
     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
   end
 
   def test_unhide


@@ -763,82 +788,94 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # Try without logging in
     diary_entry = create(:diary_entry, :user => user, :visible => false)
 
     # 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(user, diary_entry)

     assert_response :forbidden
     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
 
     # Now try as a normal user

-    post :unhide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => user }
-    assert_response :redirect
+    session_for(user)
+    post unhide_diary_entry_path(user, diary_entry)

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_redirected_to :controller => :errors, :action => :forbidden

-    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+    assert_not DiaryEntry.find(diary_entry.id).visible
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    post unhide_diary_entry_path(user, diary_entry)
+    assert_redirected_to :action => :index, :display_name => user.display_name
+    assert DiaryEntry.find(diary_entry.id).visible
+
+    # Reset
+    diary_entry.reload.update(:visible => true)

 
     # Finally try as an administrator
 
     # Finally try as an administrator

-    post :unhide,
-         :params => { :display_name => user.display_name, :id => diary_entry.id },
-         :session => { :user => create(:administrator_user) }
-    assert_response :redirect
+    session_for(create(:administrator_user))
+    post unhide_diary_entry_path(user, diary_entry)

     assert_redirected_to :action => :index, :display_name => user.display_name
     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)
   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)
     diary_entry = create(:diary_entry, :user => user)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry)

+

     # Try without logging in
     # 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(user, diary_entry, diary_comment)

     assert_response :forbidden
     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
 
     # 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 }
-    assert_response :redirect
+    session_for(user)
+    post hide_diary_comment_path(user, diary_entry, diary_comment)

     assert_redirected_to :controller => :errors, :action => :forbidden
     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(user, diary_entry, diary_comment)
+    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
 
     # 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 }
-    assert_response :redirect
+    session_for(create(:administrator_user))
+    post hide_diary_comment_path(user, diary_entry, diary_comment)

     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     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)
   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)
     diary_entry = create(:diary_entry, :user => user)
     diary_comment = create(:diary_comment, :diary_entry => diary_entry, :visible => false)

+

     # Try without logging in
     # 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(user, diary_entry, diary_comment)

     assert_response :forbidden
     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
 
     # 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 }
-    assert_response :redirect
+    session_for(user)
+    post unhide_diary_comment_path(user, diary_entry, diary_comment)

     assert_redirected_to :controller => :errors, :action => :forbidden
     assert_redirected_to :controller => :errors, :action => :forbidden

-    assert_equal false, DiaryComment.find(diary_comment.id).visible
+    assert_not DiaryComment.find(diary_comment.id).visible
+
+    # Now try as a moderator
+    session_for(create(:moderator_user))
+    post unhide_diary_comment_path(user, diary_entry, diary_comment)
+    assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
+    assert DiaryComment.find(diary_comment.id).visible
+
+    # Reset
+    diary_comment.reload.update(:visible => true)

 
     # Finally try as an administrator
 
     # 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 }
-    assert_response :redirect
+    session_for(create(:administrator_user))
+    post unhide_diary_comment_path(user, diary_entry, diary_comment)

     assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
     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
   end
 
   def test_comments


@@ -846,42 +883,71 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     other_user = create(:user)
     suspended_user = create(:user, :suspended)
     deleted_user = create(:user, :deleted)
     other_user = create(:user)
     suspended_user = create(:user, :suspended)
     deleted_user = create(:user, :deleted)

+

     # Test a user with no comments
     # 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_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)
 
 
     # 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_response :success
     assert_template :comments

-    assert_select "table.messages" do
-      assert_select "tr", :count => 2 # header and one comment
+    assert_dom "a[href='#{user_path(other_user)}']", :text => other_user.display_name
+    assert_select "table.table-striped tbody" do
+      assert_select "tr", :count => 1

     end
 
     # Test a suspended user
     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
     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
 
     assert_response :not_found
   end
 

+  def test_comments_invalid_paged
+    user = create(:user)
+
+    %w[-1 0 fred].each do |id|
+      get diary_comments_path(:display_name => user.display_name, :before => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+
+      get diary_comments_path(:display_name => user.display_name, :after => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+    end
+  end
+
+  def test_subscribe_page
+    user = create(:user)
+    other_user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
+    path = diary_entry_subscribe_path(user, diary_entry)
+
+    get path
+    assert_redirected_to login_path(:referer => path)
+
+    session_for(other_user)
+    get path
+    assert_response :success
+    assert_dom ".content-body" do
+      assert_dom "a[href='#{diary_entry_path(user, diary_entry)}']", :text => diary_entry.title
+      assert_dom "a[href='#{user_path(user)}']", :text => user.display_name
+    end
+  end
+

   def test_subscribe_success
     user = create(:user)
     other_user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
 
   def test_subscribe_success
     user = create(:user)
     other_user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
 

+    session_for(other_user)

     assert_difference "diary_entry.subscribers.count", 1 do
     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(user, diary_entry)

     end
     assert_response :redirect
   end
     end
     assert_response :redirect
   end


@@ -894,25 +960,38 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do
 
     # 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(user, diary_entry)

     end
     assert_response :forbidden
 
     end
     assert_response :forbidden
 

+    session_for(other_user)
+

     # bad diary id
     # bad diary id

-    post :subscribe,
-         :params => { :id => 999111, :display_name => "username" },
-         :session => { :user => other_user }
+    post diary_entry_subscribe_path("username", 999111)

     assert_response :not_found
 
     # trying to subscribe when already subscribed
     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(user, diary_entry)

     assert_no_difference "diary_entry.subscribers.count" do
     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(user, diary_entry)
+    end
+  end
+
+  def test_unsubscribe_page
+    user = create(:user)
+    other_user = create(:user)
+    diary_entry = create(:diary_entry, :user => user)
+    path = diary_entry_unsubscribe_path(user, diary_entry)
+
+    get path
+    assert_redirected_to login_path(:referer => path)
+
+    session_for(other_user)
+    get path
+    assert_response :success
+    assert_dom ".content-body" do
+      assert_dom "a[href='#{diary_entry_path(user, diary_entry)}']", :text => diary_entry.title
+      assert_dom "a[href='#{user_path(user)}']", :text => user.display_name

     end
   end
 
     end
   end
 


@@ -921,14 +1000,11 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     other_user = create(:user)
 
     diary_entry = create(:diary_entry, :user => user)
     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
     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(user, diary_entry)

     end
     assert_response :redirect
   end
     end
     assert_response :redirect
   end


@@ -941,22 +1017,19 @@ class DiaryEntriesControllerTest < ActionController::TestCase
 
     # not signed in
     assert_no_difference "diary_entry.subscribers.count" do
 
     # 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(user, diary_entry)

     end
     assert_response :forbidden
 
     end
     assert_response :forbidden
 

+    session_for(other_user)
+

     # bad diary id
     # bad diary id

-    post :unsubscribe,
-         :params => { :id => 999111, :display_name => "username" },
-         :session => { :user => other_user }
+    post diary_entry_unsubscribe_path("username", 999111)

     assert_response :not_found
 
     # trying to unsubscribe when not subscribed
     assert_no_difference "diary_entry.subscribers.count" do
     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(user, diary_entry)

     end
   end
 
     end
   end
 


@@ -966,19 +1039,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_response :success
     assert_template "index"
     assert_no_missing_translations
     assert_response :success
     assert_template "index"
     assert_no_missing_translations

-    assert_select "div.diary_post", entries.count
+    assert_select "article.diary_post", entries.count

 
     entries.each do |entry|
       assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"
     end
   end
 
     entries.each do |entry|
       assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"
     end
   end

-
-  def with_diary_feed_delay(value)
-    diary_feed_delay = Settings.diary_feed_delay
-    Settings.diary_feed_delay = value
-
-    yield
-
-    Settings.diary_feed_delay = diary_feed_delay
-  end

 end
 end