Update to iD v1.3.6

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

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index cc13cb675bd1294a49edda26bb3848a69f0366ce..92d9bcffdaae41b47ef2e0db50278016d61df76c 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -86,8 +86,6 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
 
   def test_showing_new_diary_entry
   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"
     get :new
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"


@@ -98,34 +96,24 @@ class DiaryEntryControllerTest < ActionController::TestCase
     #print @response.body
     
     #print @response.to_yaml
     #print @response.body
     
     #print @response.to_yaml

-    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
-            # 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
+    assert_select "title", :text => /New Diary Entry/, :count => 1
+    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

-        

   end
   
   def test_editing_diary_entry
   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 
     entry = diary_entries(:normal_user_entry_1)
 
     # Make sure that you are redirected to the login page when you are 


@@ -137,46 +125,32 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # 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
     # 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.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
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => "No entry with the id: 9999", :count => 1

     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, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id})
     assert_response :success
     # 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, {: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.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
+    assert_select "title", :text => /Edit diary entry/, :count => 1
+    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

-    
+

     # Now lets see if you can edit the diary entry
     new_title = "New Title"
     new_body = "This is a new body for the diary entry"
     # Now lets see if you can edit the diary entry
     new_title = "New Title"
     new_body = "This is a new body for the diary entry"


@@ -194,73 +168,49 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
     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
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /Users' diaries | /, :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 "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
+    assert_select "title", :text => /Users' diaries | /, :count => 1
+    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

-
-    @request.cookies["_osm_username"] = users(:public_user).display_name

 
     # and when not logged in as the user who wrote the entry
     get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
 
     # and when not logged in as the user who wrote the entry
     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
-      assert_select "head", :count => 1 do
-        assert_select "title", :text => /Users' diaries | /, :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 "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
+    assert_select "title", :text => /Users' diaries | /, :count => 1
+    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

-    #print @response.body
-    

   end
   
   def test_edit_diary_entry_i18n
   end
   
   def test_edit_diary_entry_i18n

-    @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
     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

-    @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
     # Make sure that you are redirected to the login page when you
     # are not logged in
     get :new


@@ -270,29 +220,21 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # Now try again when logged in
     get :new, {}, {:user => users(:normal_user).id}
     assert_response :success
     # 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
+    assert_select "title", :text => /New Diary Entry/, :count => 1
+    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
 


@@ -310,7 +252,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     end
     assert_response :redirect
     assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name
     end
     assert_response :redirect
     assert_redirected_to :action => :list, :display_name => users(:normal_user).display_name

-    entry = DiaryEntry.find(4)
+    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 users(:normal_user).id, entry.user_id
     assert_equal new_title, entry.title
     assert_equal new_body, entry.body


@@ -320,7 +262,6 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_creating_diary_comment
   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
     entry = diary_entries(:normal_user_entry_1)
 
     # Make sure that you are denied when you are not logged in


@@ -330,14 +271,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
     # 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
     # 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
+    assert_select "div.content-heading", :count => 1 do
+      assert_select "h2", :text => "No entry with the id: 9999", :count => 1

     end
 
     # Now try again with the right id
     end
 
     # Now try again with the right id


@@ -354,7 +289,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_match /New comment/, email.text_part.decoded
     assert_match /New comment/, email.html_part.decoded
     ActionMailer::Base.deliveries.clear
     assert_match /New comment/, email.text_part.decoded
     assert_match /New comment/, email.html_part.decoded
     ActionMailer::Base.deliveries.clear

-    comment = DiaryComment.find(4)
+    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
     assert_equal entry.id, comment.diary_entry_id
     assert_equal users(:public_user).id, comment.user_id
     assert_equal "New comment", comment.body


@@ -363,7 +298,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :view, :display_name => entry.user.display_name, :id => entry.id
     assert_response :success
     assert_select ".diary-comment", :count => 1 do
     get :view, :display_name => entry.user.display_name, :id => entry.id
     assert_response :success
     assert_select ".diary-comment", :count => 1 do

-      assert_select "#comment4", :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
         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


@@ -421,14 +356,49 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss_nonexisting_user
   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"
     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
   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
     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
   end
 
   def test_hide


@@ -437,16 +407,12 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :forbidden
     assert_equal true, DiaryEntry.find(diary_entries(:normal_user_entry_1).id).visible
 
     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
 
     # 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
     # 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


@@ -460,20 +426,42 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_response :forbidden
     assert_equal true, DiaryComment.find(diary_comments(:comment_for_geo_post).id).visible
 
     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
 
     # 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
     # 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
 end