More whitespace fixes. Attempting to get tests to pass.

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

diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb
index a84138184655ad2c63aa3c3f8f764242b9325e79..d0cbeb796a9593fb425b0be53fba45f2f8f33d98 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -71,12 +71,49 @@ class BrowseControllerTest < ActionController::TestCase
 
   def test_read_changeset
     browse_check "changeset", changesets(:normal_user_first_change).id, "browse/changeset"
 
   def test_read_changeset
     browse_check "changeset", changesets(:normal_user_first_change).id, "browse/changeset"

+    browse_check "changeset", changesets(:public_user_first_change).id, "browse/changeset"
+  end
+
+  def test_read_changeset_hidden_comments
+    browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
+    assert_select "div.changeset-comments ul li", :count => 3
+
+    session[:user] = users(:moderator_user).id
+
+    browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset"
+    assert_select "div.changeset-comments ul li", :count => 4

   end
 
   def test_read_note
     browse_check "note", notes(:open_note).id, "browse/note"
   end
 
   end
 
   def test_read_note
     browse_check "note", notes(:open_note).id, "browse/note"
   end
 

+  def test_read_hidden_note
+    get :note, :id => notes(:hidden_note_with_comment).id
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "map"
+
+    xhr :get, :note, :id => notes(:hidden_note_with_comment).id
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "xhr"
+
+    session[:user] = users(:moderator_user).id
+
+    browse_check "note", notes(:hidden_note_with_comment).id, "browse/note"
+  end
+
+  def test_read_note_hidden_comments
+    browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 1
+
+    session[:user] = users(:moderator_user).id
+
+    browse_check "note", notes(:note_with_hidden_comment).id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 2
+  end
+

   ##
   #  Methods to check redaction.
   #
   ##
   #  Methods to check redaction.
   #


@@ -150,6 +187,16 @@ class BrowseControllerTest < ActionController::TestCase
       get type, :id => -10 # we won't have an id that's negative
     end
 
       get type, :id => -10 # we won't have an id that's negative
     end
 

+    get type, :id => 0
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "map"
+
+    xhr :get, type, :id => 0
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "xhr"
+

     get type, :id => id
     assert_response :success
     assert_template template
     get type, :id => id
     assert_response :success
     assert_template template