X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bd7a912aa69237cec34c711aefb9454360b094a8..f892313c48d64a7b5453d2772d72648795cf363b:/test/functional/diary_entry_controller_test.rb

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 3a402b602..7e0f10790 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -5,7 +5,89 @@ class DiaryEntryControllerTest < ActionController::TestCase
 
   include ActionView::Helpers::NumberHelper
 
+  ##
+  # test all routes which lead to this controller
+  def test_routes
+    assert_routing(
+      { :path => "/diary", :method => :get },
+      { :controller => "diary_entry", :action => "list" }
+    )
+    assert_routing(
+      { :path => "/diary/language", :method => :get },
+      { :controller => "diary_entry", :action => "list", :language => "language" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary", :method => :get },
+      { :controller => "diary_entry", :action => "list", :display_name => "username" }
+    )
+    assert_routing(
+      { :path => "/diary/friends", :method => :get },
+      { :controller => "diary_entry", :action => "list", :friends => true }
+    )
+    assert_routing(
+      { :path => "/diary/nearby", :method => :get },
+      { :controller => "diary_entry", :action => "list", :nearby => true }
+    )
+
+    assert_routing(
+      { :path => "/diary/rss", :method => :get },
+      { :controller => "diary_entry", :action => "rss", :format => :rss }
+    )
+    assert_routing(
+      { :path => "/diary/language/rss", :method => :get },
+      { :controller => "diary_entry", :action => "rss", :language => "language", :format => :rss }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/rss", :method => :get },
+      { :controller => "diary_entry", :action => "rss", :display_name => "username", :format => :rss }
+    )
+
+    assert_routing(
+      { :path => "/user/username/diary/comments", :method => :get },
+      { :controller => "diary_entry", :action => "comments", :display_name => "username" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/comments/1", :method => :get },
+      { :controller => "diary_entry", :action => "comments", :display_name => "username", :page => "1" }
+    )
+
+    assert_routing(
+      { :path => "/diary/new", :method => :get },
+      { :controller => "diary_entry", :action => "new" }
+    )
+    assert_routing(
+      { :path => "/diary/new", :method => :post },
+      { :controller => "diary_entry", :action => "new" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1", :method => :get },
+      { :controller => "diary_entry", :action => "view", :display_name => "username", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1/edit", :method => :get },
+      { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1/edit", :method => :post },
+      { :controller => "diary_entry", :action => "edit", :display_name => "username", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1/newcomment", :method => :post },
+      { :controller => "diary_entry", :action => "comment", :display_name => "username", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1/hide", :method => :post },
+      { :controller => "diary_entry", :action => "hide", :display_name => "username", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/user/username/diary/1/hidecomment/2", :method => :post },
+      { :controller => "diary_entry", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }
+    )
+  end
+
   def test_showing_new_diary_entry
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
     get :new
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"
@@ -21,16 +103,20 @@ class DiaryEntryControllerTest < ActionController::TestCase
         assert_select "title", :text => /New Diary Entry/, :count => 1
       end
       assert_select "body", :count => 1 do
-        assert_select "div#content", :count => 1 do
-          assert_select "h1", "New Diary Entry", :count => 1
-          # We don't care about the layout, we just care about the form fields
-          # that are available
-          assert_select "form[action='/diary/new']", :count => 1 do
-            assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1
-            assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1
-            assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1
-            assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
-            assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h1", :text => "New Diary Entry", :count => 1
+          end
+          assert_select "div#content", :count => 1 do
+            # We don't care about the layout, we just care about the form fields
+            # that are available
+            assert_select "form[action='/diary/new']", :count => 1 do
+              assert_select "input[id=diary_entry_title][name='diary_entry[title]']", :count => 1
+              assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :count => 1
+              assert_select "input#latitude[name='diary_entry[latitude]'][type=text]", :count => 1
+              assert_select "input#longitude[name='diary_entry[longitude]'][type=text]", :count => 1
+              assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+            end
           end
         end
       end
@@ -39,46 +125,53 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_editing_diary_entry
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+    entry = diary_entries(:normal_user_entry_1)
+
     # 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
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit"
-    
-    get :edit, :id => diary_entries(:normal_user_entry_1).id
+    get :edit, :display_name => entry.user.display_name, :id => entry.id
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit"
+    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{entry.user.display_name}/diary/#{entry.id}/edit"
     
-    # Verify that you get a not found error, when you don't pass an id
-    get(:edit, nil, {'user' => users(:normal_user).id})
+    # Verify that you get a not found error, when you pass a bogus id
+    get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id})
     assert_response :not_found
     assert_select "html", :count => 1 do
       assert_select "body", :count => 1 do
-        assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => "No entry with the id:", :count => 1 
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h2", :text => "No entry with the id: 9999", :count => 1 
+          end
         end
       end
     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, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id})
     assert_response :success
     assert_select "html", :count => 1 do
       assert_select "head", :count => 1 do
         assert_select "title", :text => /Edit diary entry/, :count => 1
       end
       assert_select "body", :count => 1 do
-        assert_select "div#content", :count => 1 do 
-          assert_select "h1", :text => /Edit diary entry/, :count => 1
-          assert_select "form[action='/diary_entry/#{diary_entries(:normal_user_entry_1).id}/edit'][method=post]", :count => 1 do
-            assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{diary_entries(:normal_user_entry_1).title}']", :count => 1
-            assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => diary_entries(:normal_user_entry_1).body, :count => 1
-            assert_select "select#diary_entry_language_code", :count => 1
-            assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
-            assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
-            assert_select "input[name=commit][type=submit][value=Save]", :count => 1
-            assert_select "input", :count => 5
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h1", :text => /Edit diary entry/, :count => 1
+          end
+          assert_select "div#content", :count => 1 do 
+            assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
+              assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
+              assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
+              assert_select "select#diary_entry_language_code", :count => 1
+              assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
+              assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
+              assert_select "input[name=commit][type=submit][value=Save]", :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
+            end
           end
         end
       end
@@ -90,15 +183,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
     new_latitude = "1.1"
     new_longitude = "2.2"
     new_language_code = "en"
-    post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', 
+    post(:edit, {: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} },
-         {'user' => users(:normal_user).id})
+         {'user' => entry.user.id})
     assert_response :redirect
-    assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id
+    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
     
     # Now check that the new data is rendered, when logged in
-    get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id}
+    get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
     assert_select "html", :count => 1 do
@@ -106,22 +199,28 @@ class DiaryEntryControllerTest < ActionController::TestCase
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end
       assert_select "body", :count => 1 do
-        assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
-          assert_select "b", :text => /#{new_title}/, :count => 1
-          # This next line won't work if the text has been run through the htmlize function
-          # due to formatting that could be introduced
-          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/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
+          end
+          assert_select "div#content", :count => 1 do
+            assert_select "div.post_heading", :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
+            #print @response.body
+            assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+          end
         end
       end
     end
-    
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
     # and when not logged in as the user who wrote the entry
-    get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
+    get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
     assert_select "html", :count => 1 do
@@ -129,16 +228,20 @@ class DiaryEntryControllerTest < ActionController::TestCase
         assert_select "title", :text => /Users' diaries | /, :count => 1
       end
       assert_select "body", :count => 1 do
-        assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
-          assert_select "b", :text => /#{new_title}/, :count => 1
-          # This next line won't work if the text has been run through the htmlize function
-          # due to formatting that could be introduced
-          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
-          assert_select "span[class=hidden show_if_user_#{users(:normal_user).id}]", :count => 1 do
-            assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
+          end
+          assert_select "div#content", :count => 1 do
+            assert_select "div.post_heading", :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
+            assert_select "li[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
+              assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
+            end
           end
         end
       end
@@ -148,17 +251,123 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_edit_diary_entry_i18n
-    get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    get :edit, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id}
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
   end
   
   def test_create_diary_entry
-    #post :new
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # 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 => :user, :action => :login, :referer => "/diary/new"
+
+    # Now try again when logged in
+    get :new, {}, {:user => users(:normal_user).id}
+    assert_response :success
+    assert_select "html", :count => 1 do
+      assert_select "head", :count => 1 do
+        assert_select "title", :text => /New Diary Entry/, :count => 1
+      end
+      assert_select "body", :count => 1 do
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h1", :text => /New Diary Entry/, :count => 1
+          end
+          assert_select "div#content", :count => 1 do 
+            assert_select "form[action='/diary/new'][method=post]", :count => 1 do
+              assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1
+              assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1
+              assert_select "select#diary_entry_language_code", :count => 1
+              assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
+              assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
+              assert_select "input[name=commit][type=submit][value=Save]", :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
+            end
+          end
+        end
+      end
+    end
+
+    # Now try creating a diary entry
+    new_title = "New Title"
+    new_body = "This is a new body for the diary entry"
+    new_latitude = "1.1"
+    new_longitude = "2.2"
+    new_language_code = "en"
+    assert_difference "DiaryEntry.count", 1 do
+      post(:new, {'commit' => 'save', 
+        'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude,
+        'longitude' => new_longitude, 'language_code' => new_language_code} },
+           {:user => users(:normal_user).id})
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
+    entry = DiaryEntry.find(6)
+    assert_equal users(:normal_user).id, entry.user_id
+    assert_equal new_title, entry.title
+    assert_equal new_body, entry.body
+    assert_equal new_latitude.to_f, entry.latitude
+    assert_equal new_longitude.to_f, entry.longitude
+    assert_equal new_language_code, entry.language_code
   end
   
   def test_creating_diary_comment
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+    entry = diary_entries(:normal_user_entry_1)
+
+    # Make sure that you are denied when you are not logged in
+    post :comment, :display_name => entry.user.display_name, :id => entry.id
+    assert_response :forbidden
     
+    # Verify that you get a not found error, when you pass a bogus id
+    post :comment, {:display_name => entry.user.display_name, :id => 9999}, {:user => users(:public_user).id}
+    assert_response :not_found
+    assert_select "html", :count => 1 do
+      assert_select "body", :count => 1 do
+        assert_select "div.wrapper", :count => 1 do
+          assert_select "div.content-heading", :count => 1 do
+            assert_select "h2", :text => "No entry with the id: 9999", :count => 1 
+          end
+        end
+      end
+    end
+
+    # Now try again with the right id
+    assert_difference "ActionMailer::Base.deliveries.size", 1 do
+      assert_difference "DiaryComment.count", 1 do
+        post :comment, {:display_name => entry.user.display_name, :id => entry.id, :diary_comment => {:body => "New comment"}}, {:user => users(:public_user).id}
+      end
+    end
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
+    email = ActionMailer::Base.deliveries.first
+    assert_equal [ users(:normal_user).email ], email.to
+    assert_equal "[OpenStreetMap] #{users(:public_user).display_name} commented on your diary entry", email.subject
+    assert_match /New comment/, email.text_part.decoded
+    assert_match /New comment/, email.html_part.decoded
+    ActionMailer::Base.deliveries.clear
+    comment = DiaryComment.find(5)
+    assert_equal entry.id, comment.diary_entry_id
+    assert_equal users(:public_user).id, comment.user_id
+    assert_equal "New comment", comment.body
+
+    # Now view the diary entry, and check the new comment is present
+    get :view, :display_name => entry.user.display_name, :id => entry.id
+    assert_response :success
+    assert_select ".diary-comment", :count => 1 do
+      assert_select "#comment5", :count => 1 do
+        assert_select "a[href='/user/#{users(:public_user).display_name}']", :text => users(:public_user).display_name, :count => 1
+      end
+      assert_select ".richtext", :text => /New comment/, :count => 1
+    end
   end
   
   # Check that you can get the expected response and template for all available languages
@@ -212,13 +421,120 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss_nonexisting_user
+    # Try a user that has never existed
     get :rss, {:display_name => 'fakeUsername76543', :format => :rss}
     assert_response :not_found, "Should not be able to get a nonexisting users diary RSS"
+
+    # Try a suspended user
+    get :rss, {:display_name => users(:suspended_user).display_name, :format => :rss}
+    assert_response :not_found, "Should not be able to get a suspended users diary RSS"
+
+    # Try a deleted user
+    get :rss, {:display_name => users(:deleted_user).display_name, :format => :rss}
+    assert_response :not_found, "Should not be able to get a deleted users diary RSS"
   end
 
   def test_viewing_diary_entry
+    # Try a normal entry that should work
     get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}
     assert_response :success
-    assert_template 'view'
+    assert_template :view
+
+    # Try a deleted entry
+    get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:deleted_entry).id}
+    assert_response :not_found
+
+    # Try an entry by a suspended user
+    get :view, {:display_name => users(:suspended_user).display_name, :id => diary_entries(:entry_by_suspended_user).id}
+    assert_response :not_found
+
+    # Try an entry by a deleted user
+    get :view, {:display_name => users(:deleted_user).display_name, :id => diary_entries(:entry_by_deleted_user).id}
+    assert_response :not_found
+  end
+
+  def test_viewing_hidden_comments
+    # Get a diary entry that has hidden comments
+    get :view, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id}
+    assert_response :success
+    assert_template :view
+    assert_select "div.comments" do
+      assert_select "p#comment1", :count => 1 # visible comment
+      assert_select "p#comment2", :count => 0 # comment by suspended user
+      assert_select "p#comment3", :count => 0 # comment by deleted user
+      assert_select "p#comment4", :count => 0 # hidden comment
+    end
+  end
+
+  def test_hide
+    # Try without logging in
+    post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}
+    assert_response :forbidden
+    assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # Now try as a normal user
+    post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:normal_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id
+    assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible
+
+    @request.cookies["_osm_username"] = users(:administrator_user).display_name
+
+    # Finally try as an administrator
+    post :hide, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_entry_1).id}, {:user => users(:administrator_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
+    assert_equal false, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible
+  end
+
+  def test_hidecomment
+    # Try without logging in
+    post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}
+    assert_response :forbidden
+    assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible
+
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
+    # Now try as a normal user
+    post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:normal_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id
+    assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible
+
+    @request.cookies["_osm_username"] = users(:administrator_user).display_name
+
+    # Finally try as an administrator
+    post :hidecomment, {:display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id, :comment => diary_comments(:comment_for_geo_post).id}, {:user => users(:administrator_user).id}
+    assert_response :redirect
+    assert_redirected_to :action => :view, :display_name => users(:normal_user).display_name, :id => diary_entries(:normal_user_geo_entry).id
+    assert_equal false, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible
+  end
+
+  def test_comments
+    # Test a user with no comments
+    get :comments, :display_name => users(:normal_user).display_name
+    assert_response :success
+    assert_template :comments
+    assert_select "table.messages" do
+      assert_select "tr", :count => 1 # header, no comments
+    end
+
+    # Test a user with a comment
+    get :comments, :display_name => users(:public_user).display_name
+    assert_response :success
+    assert_template :comments
+    assert_select "table.messages" do
+      assert_select "tr", :count => 2 # header and one comment
+    end
+
+    # Test a suspended user
+    get :comments, :display_name => users(:suspended_user).display_name
+    assert_response :not_found
+
+    # Test a deleted user
+    get :comments, :display_name => users(:deleted_user).display_name
+    assert_response :not_found
   end
 end