Merge branch 'master' into notes-search

[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 68345c6b6b70e8b73a41a93bd81fe51d119dc6e1..d6bde97d6add65bdcbaa9dc90088875f1a625640 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -68,8 +68,10 @@ class BrowseControllerTest < ActionController::TestCase
   end
 
   def test_read_changeset
+    user = create(:user)
     private_changeset = create(:changeset, :user => create(:user, :data_public => false))
-    changeset = create(:changeset)
+    changeset = create(:changeset, :user => user)
+    create(:changeset, :user => user)
     browse_check "changeset", private_changeset.id, "browse/changeset"
     browse_check "changeset", changeset.id, "browse/changeset"
   end
@@ -126,6 +128,21 @@ class BrowseControllerTest < ActionController::TestCase
     assert_select "div.note-comments ul li", :count => 2
   end
 
+  def test_read_note_hidden_user_comment
+    hidden_user = create(:user, :status => "deleted")
+    note_with_hidden_user_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :author => hidden_user)
+    end
+
+    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 1
+
+    session[:user] = create(:moderator_user).id
+
+    browse_check "note", note_with_hidden_user_comment.id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 1
+  end
+
   ##
   #  Methods to check redaction.
   #