X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..119016255ec56bb7e7bc74be19858380e868da93:/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 2ab9106f1..d0cbeb796 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'browse_controller' +require "test_helper" +require "browse_controller" class BrowseControllerTest < ActionController::TestCase api_fixtures @@ -46,35 +46,72 @@ class BrowseControllerTest < ActionController::TestCase end def test_read_relation - browse_check 'relation', relations(:visible_relation).relation_id, 'browse/feature' + browse_check "relation", relations(:visible_relation).relation_id, "browse/feature" end def test_read_relation_history - browse_check 'relation_history', relations(:visible_relation).relation_id, 'browse/history' + browse_check "relation_history", relations(:visible_relation).relation_id, "browse/history" end def test_read_way - browse_check 'way', ways(:visible_way).way_id, 'browse/feature' + browse_check "way", ways(:visible_way).way_id, "browse/feature" end def test_read_way_history - browse_check 'way_history', ways(:visible_way).way_id, 'browse/history' + browse_check "way_history", ways(:visible_way).way_id, "browse/history" end def test_read_node - browse_check 'node', nodes(:visible_node).node_id, 'browse/feature' + browse_check "node", nodes(:visible_node).node_id, "browse/feature" end def test_read_node_history - browse_check 'node_history', nodes(:visible_node).node_id, 'browse/history' + browse_check "node_history", nodes(:visible_node).node_id, "browse/history" end def test_read_changeset - browse_check 'changeset', changesets(:normal_user_first_change).id, 'browse/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' + 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 ## @@ -114,7 +151,7 @@ class BrowseControllerTest < ActionController::TestCase def test_redacted_way_history get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id assert_response :success - assert_template 'browse/history' + assert_template "browse/history" # there are 4 revisions of the redacted way, but only 2 # should be showing details here. @@ -126,7 +163,7 @@ class BrowseControllerTest < ActionController::TestCase def test_redacted_relation_history get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id assert_response :success - assert_template 'browse/history' + assert_template "browse/history" # there are 4 revisions of the redacted relation, but only 2 # should be showing details here. @@ -135,7 +172,7 @@ class BrowseControllerTest < ActionController::TestCase assert_select ".browse-section.browse-relation", 2 end -private + private # This is a convenience method for most of the above checks # First we check that when we don't have an id, it will correctly return a 404 @@ -147,15 +184,25 @@ private end assert_raise ActionController::UrlGenerationError do - get type, {:id => -10} # we won't have an id that's negative + get type, :id => -10 # we won't have an id that's negative end - get type, {:id => id} + 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 assert_template :layout => "map" - xhr :get, type, {:id => id} + xhr :get, type, :id => id assert_response :success assert_template template assert_template :layout => "xhr"