Merge remote-tracking branch 'openstreetmap/pull/1423'

[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..c5f1eef5c93bc1d1327707e296e91757596588dd 100644 (file)
--- a/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@ -71,10 +71,58 @@ class BrowseControllerTest < ActionController::TestCase
 
   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
+    create_list(:changeset_comment, 3)
+    create(:changeset_comment, :visible => false)
+
+    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"
+    open_note = create(:note_with_comments)
+
+    browse_check "note", open_note.id, "browse/note"
+  end
+
+  def test_read_hidden_note
+    hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
+
+    get :note, :id => hidden_note_with_comment.id
+    assert_response :not_found
+    assert_template "browse/not_found"
+    assert_template :layout => "map"
+
+    xhr :get, :note, :id => 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", hidden_note_with_comment.id, "browse/note"
+  end
+
+  def test_read_note_hidden_comments
+    note_with_hidden_comment = create(:note_with_comments, :comments_count => 2) do |note|
+      create(:note_comment, :note => note, :visible => false)
+    end
+
+    browse_check "note", 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", note_with_hidden_comment.id, "browse/note"
+    assert_select "div.note-comments ul li", :count => 2
   end
 
   ##
@@ -150,6 +198,16 @@ class BrowseControllerTest < ActionController::TestCase
       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