X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a91e50d308edafa975588287179d0ffbad4f5bc9..5708c25e04a3d31796771fbcb44485bf601cec8b:/test/controllers/browse_controller_test.rb?ds=inline diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index c5f1eef5c..40e11a749 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -1,9 +1,6 @@ require "test_helper" -require "browse_controller" class BrowseControllerTest < ActionController::TestCase - api_fixtures - ## # test all routes which lead to this controller def test_routes @@ -43,47 +40,56 @@ class BrowseControllerTest < ActionController::TestCase { :path => "/note/new", :method => :get }, { :controller => "browse", :action => "new_note" } ) + assert_routing( + { :path => "/query", :method => :get }, + { :controller => "browse", :action => "query" } + ) end def test_read_relation - browse_check "relation", relations(:visible_relation).relation_id, "browse/feature" + browse_check "relation", create(: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", create(:relation, :with_history).id, "browse/history" end def test_read_way - browse_check "way", ways(:visible_way).way_id, "browse/feature" + browse_check "way", create(: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", create(:way, :with_history).id, "browse/history" end def test_read_node - browse_check "node", nodes(:visible_node).node_id, "browse/feature" + browse_check "node", create(: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", create(:node, :with_history).id, "browse/history" end 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" + user = create(:user) + private_changeset = create(:changeset, :user => create(:user, :data_public => false)) + 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 def test_read_changeset_hidden_comments - create_list(:changeset_comment, 3) - create(:changeset_comment, :visible => false) + changeset = create(:changeset) + create_list(:changeset_comment, 3, :changeset => changeset) + create(:changeset_comment, :visible => false, :changeset => changeset) - browse_check "changeset", changesets(:normal_user_closed_change).id, "browse/changeset" + browse_check "changeset", changeset.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" + browse_check "changeset", changeset.id, "browse/changeset" assert_select "div.changeset-comments ul li", :count => 4 end @@ -96,17 +102,17 @@ class BrowseControllerTest < ActionController::TestCase def test_read_hidden_note hidden_note_with_comment = create(:note_with_comments, :status => "hidden") - get :note, :id => hidden_note_with_comment.id + get :note, :params => { :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 + get :note, :params => { :id => hidden_note_with_comment.id }, :xhr => true assert_response :not_found 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 @@ -119,12 +125,27 @@ class BrowseControllerTest < ActionController::TestCase 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 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. # @@ -134,7 +155,11 @@ class BrowseControllerTest < ActionController::TestCase # then please make it more easily (and robustly) testable! ## def test_redacted_node - get :node, :id => current_nodes(:redacted_node).id + node = create(:node, :with_history, :deleted, :version => 2) + node_v1 = node.old_nodes.find_by(:version => 1) + node_v1.redact!(create(:redaction)) + + get :node, :params => { :id => node.id } assert_response :success assert_template "feature" @@ -146,7 +171,11 @@ class BrowseControllerTest < ActionController::TestCase end def test_redacted_node_history - get :node_history, :id => nodes(:redacted_node_redacted_version).node_id + node = create(:node, :with_history, :deleted, :version => 2) + node_v1 = node.old_nodes.find_by(:version => 1) + node_v1.redact!(create(:redaction)) + + get :node_history, :params => { :id => node.id } assert_response :success assert_template "browse/history" @@ -160,7 +189,13 @@ class BrowseControllerTest < ActionController::TestCase end def test_redacted_way_history - get :way_history, :id => ways(:way_with_redacted_versions_v1).way_id + way = create(:way, :with_history, :version => 4) + way_v1 = way.old_ways.find_by(:version => 1) + way_v1.redact!(create(:redaction)) + way_v3 = way.old_ways.find_by(:version => 3) + way_v3.redact!(create(:redaction)) + + get :way_history, :params => { :id => way.id } assert_response :success assert_template "browse/history" @@ -172,7 +207,13 @@ class BrowseControllerTest < ActionController::TestCase end def test_redacted_relation_history - get :relation_history, :id => relations(:relation_with_redacted_versions_v1).relation_id + relation = create(:relation, :with_history, :version => 4) + relation_v1 = relation.old_relations.find_by(:version => 1) + relation_v1.redact!(create(:redaction)) + relation_v3 = relation.old_relations.find_by(:version => 3) + relation_v3.redact!(create(:redaction)) + + get :relation_history, :params => { :id => relation.id } assert_response :success assert_template "browse/history" @@ -183,6 +224,18 @@ class BrowseControllerTest < ActionController::TestCase assert_select ".browse-section.browse-relation", 2 end + def test_new_note + get :new_note + assert_response :success + assert_template "browse/new_note" + end + + def test_query + get :query + assert_response :success + assert_template "browse/query" + end + private # This is a convenience method for most of the above checks @@ -195,25 +248,25 @@ class BrowseControllerTest < ActionController::TestCase end assert_raise ActionController::UrlGenerationError do - get type, :id => -10 # we won't have an id that's negative + get type, :params => { :id => -10 } # we won't have an id that's negative end - get type, :id => 0 + get type, :params => { :id => 0 } assert_response :not_found assert_template "browse/not_found" assert_template :layout => "map" - xhr :get, type, :id => 0 + get type, :params => { :id => 0 }, :xhr => true assert_response :not_found assert_template "browse/not_found" assert_template :layout => "xhr" - get type, :id => id + get type, :params => { :id => id } assert_response :success assert_template template assert_template :layout => "map" - xhr :get, type, :id => id + get type, :params => { :id => id }, :xhr => true assert_response :success assert_template template assert_template :layout => "xhr"