X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3123822bba5865e81e8c10be16452a0a8b5362f9..1a1d924ae060f82567599b25b090a729d5c721e9:/test/controllers/browse_controller_test.rb?ds=sidebyside diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 661d06401..19f60035b 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -75,25 +75,26 @@ class BrowseControllerTest < ActionController::TestCase 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 + session[:user] = create(: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 - open_note = create(:note) - create(:note_comment, :note => open_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, :status => "hidden") - create(:note_comment, :note => hidden_note_with_comment) + hidden_note_with_comment = create(:note_with_comments, :status => "hidden") get :note, :id => hidden_note_with_comment.id assert_response :not_found @@ -105,21 +106,20 @@ class BrowseControllerTest < ActionController::TestCase assert_template "browse/not_found" assert_template :layout => "xhr" - session[:user] = users(:moderator_user).id + session[:user] = create(: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) - create(:note_comment, :note => note_with_hidden_comment) - create(:note_comment, :note => note_with_hidden_comment) - create(:note_comment, :note => note_with_hidden_comment, :visible => false) + 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 + session[:user] = create(:moderator_user).id browse_check "note", note_with_hidden_comment.id, "browse/note" assert_select "div.note-comments ul li", :count => 2