X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..746bfd0a4838268eaf745e85e0e27b5acf9cf64a:/test/controllers/browse_controller_test.rb diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index d0cbeb796..2bb743636 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 +class BrowseControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes @@ -36,82 +33,122 @@ class BrowseControllerTest < ActionController::TestCase { :controller => "browse", :action => "changeset", :id => "1" } ) assert_routing( - { :path => "/note/1", :method => :get }, - { :controller => "browse", :action => "note", :id => "1" } - ) - assert_routing( - { :path => "/note/new", :method => :get }, - { :controller => "browse", :action => "new_note" } + { :path => "/query", :method => :get }, + { :controller => "browse", :action => "query" } ) end def test_read_relation - browse_check "relation", relations(:visible_relation).relation_id, "browse/feature" + relation = create(:relation) + browse_check :relation_path, relation.id, "browse/feature" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1 + end + assert_select ".secondary-actions a[href='#{api_relation_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 0 + end + + def test_multiple_version_relation_links + relation = create(:relation, :with_history, :version => 2) + browse_check :relation_path, relation.id, "browse/feature" + assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1 end def test_read_relation_history - browse_check "relation_history", relations(:visible_relation).relation_id, "browse/history" + relation = create(:relation, :with_history) + browse_check :relation_history_path, relation.id, "browse/history" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1 + end end def test_read_way - browse_check "way", ways(:visible_way).way_id, "browse/feature" + way = create(:way) + browse_check :way_path, way.id, "browse/feature" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1 + end + assert_select ".secondary-actions a[href='#{api_way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + end + + def test_multiple_version_way_links + way = create(:way, :with_history, :version => 2) + browse_check :way_path, way.id, "browse/feature" + assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1 end def test_read_way_history - browse_check "way_history", ways(:visible_way).way_id, "browse/history" + way = create(:way, :with_history) + browse_check :way_history_path, way.id, "browse/history" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1 + end end def test_read_node - browse_check "node", nodes(:visible_node).node_id, "browse/feature" + node = create(:node) + browse_check :node_path, node.id, "browse/feature" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 + end + assert_select ".secondary-actions a[href='#{api_node_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0 end - def test_read_node_history - browse_check "node_history", nodes(:visible_node).node_id, "browse/history" + def test_multiple_version_node_links + node = create(:node, :with_history, :version => 2) + browse_check :node_path, node.id, "browse/feature" + assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1 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" + def test_read_deleted_node + node = create(:node, :visible => false) + browse_check :node_path, node.id, "browse/feature" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 + end + assert_select "a[href='#{api_node_path node}']", :count => 0 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 + def test_read_node_history + node = create(:node, :with_history) + browse_check :node_history_path, node.id, "browse/history" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 + end end - def test_read_note - browse_check "note", notes(:open_note).id, "browse/note" + def test_read_changeset + user = create(:user) + changeset = create(:changeset, :user => user) + create(:changeset, :user => user) + browse_check :changeset_path, changeset.id, "browse/changeset" 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" + def test_read_private_changeset + user = create(:user) + changeset = create(:changeset, :user => create(:user, :data_public => false)) + create(:changeset, :user => user) + browse_check :changeset_path, changeset.id, "browse/changeset" 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 + def test_read_changeset_element_links + changeset = create(:changeset) + node = create(:node, :with_history, :changeset => changeset) - 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 + browse_check :changeset_path, changeset.id, "browse/changeset" + assert_dom "a[href='#{node_path node}']", :count => 1 + assert_dom "a[href='#{old_node_path node, 1}']", :count => 1 end ## @@ -123,7 +160,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_path(:id => node) assert_response :success assert_template "feature" @@ -135,7 +176,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_path(:id => node) assert_response :success assert_template "browse/history" @@ -149,7 +194,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_path(:id => way) assert_response :success assert_template "browse/history" @@ -161,7 +212,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_path(:id => relation) assert_response :success assert_template "browse/history" @@ -172,37 +229,45 @@ class BrowseControllerTest < ActionController::TestCase assert_select ".browse-section.browse-relation", 2 end + def test_query + get query_path + assert_response :success + assert_template "browse/query" + end + 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 # then we check that we get the correct 404 when a non-existant id is passed # then we check that it will get a successful response, when we do pass an id - def browse_check(type, id, template) + def browse_check(path, id, template) + path_method = method(path) + assert_raise ActionController::UrlGenerationError do - get type + get path_method.call end assert_raise ActionController::UrlGenerationError do - get type, :id => -10 # we won't have an id that's negative + get path_method.call(:id => -10) # we won't have an id that's negative end - get type, :id => 0 + get path_method.call(:id => 0) assert_response :not_found assert_template "browse/not_found" assert_template :layout => "map" - xhr :get, type, :id => 0 + get path_method.call(:id => 0), :xhr => true assert_response :not_found assert_template "browse/not_found" assert_template :layout => "xhr" - get type, :id => id + get path_method.call(:id => id) assert_response :success assert_template template assert_template :layout => "map" - xhr :get, type, :id => id + get path_method.call(:id => id), :xhr => true assert_response :success assert_template template assert_template :layout => "xhr"