X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f222c49dd60ea505f2c1631efa02fbd9f0f5667..b072c2935f8f79e16b2b63cc5e01fc34326f7daa:/test/controllers/old_ways_controller_test.rb diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb index 897bdba1f..6455343cf 100644 --- a/test/controllers/old_ways_controller_test.rb +++ b/test/controllers/old_ways_controller_test.rb @@ -2,18 +2,99 @@ require "test_helper" class OldWaysControllerTest < ActionDispatch::IntegrationTest def test_routes + assert_routing( + { :path => "/way/1/history", :method => :get }, + { :controller => "old_ways", :action => "index", :id => "1" } + ) assert_routing( { :path => "/way/1/history/2", :method => :get }, { :controller => "old_ways", :action => "show", :id => "1", :version => "2" } ) end - def test_visible + def test_history + way = create(:way, :with_history) + sidebar_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_history_of_redacted + 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" + + # there are 4 revisions of the redacted way, but only 2 + # should be showing details here. + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 2 + assert_select ".browse-section.browse-way", 2 + end + + def test_unredacted_history_of_redacted + session_for(create(:moderator_user)) + 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, :params => { :show_redactions => true }) + assert_response :success + assert_template "browse/history" + + assert_select ".browse-section", 4 + assert_select ".browse-section.browse-redacted", 0 + assert_select ".browse-section.browse-way", 4 + end + + def test_visible_with_one_version way = create(:way, :with_history) get old_way_path(way, 1) assert_response :success assert_template "old_ways/show" assert_template :layout => "map" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_way_path way, 1}']", :count => 0 + end + assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1 + end + + def test_visible_with_two_versions + way = create(:way, :with_history, :version => 2) + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_way_path way, 1}']", :count => 0 + end + assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 1 + assert_select ".secondary-actions a[href='#{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, 2}']", :count => 1 + + get old_way_path(way, 2) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "h4", /^Version/ do + assert_select "a[href='#{old_way_path way, 2}']", :count => 0 + end + assert_select ".secondary-actions a[href='#{api_old_way_path way, 2}']", :count => 1 + assert_select ".secondary-actions a[href='#{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 => 1 end def test_visible_with_shared_nodes @@ -30,6 +111,69 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" end + test "show unrevealed redacted versions to anonymous users" do + way = create_redacted_way + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to regular users" do + session_for(create(:user)) + way = create_redacted_way + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 0 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0 + end + + test "show unrevealed redacted versions to moderators" do + session_for(create(:moderator_user)) + way = create_redacted_way + get old_way_path(way, 1) + assert_response :success + assert_template "old_ways/show" + assert_template :layout => "map" + assert_select "td", :text => "TOP SECRET", :count => 0 + assert_select ".secondary-actions a[href='#{way_path way}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1, :params => { :show_redactions => true }}']", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 0 + assert_select ".secondary-actions a[href='#{api_old_way_path way, 1}']", :count => 0 + end + + test "don't reveal redacted versions to anonymous users" do + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "don't reveal redacted versions to regular users" do + session_for(create(:user)) + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :redirect + end + + test "reveal redacted versions to moderators" do + session_for(create(:moderator_user)) + way = create_redacted_way + get old_way_path(way, 1, :params => { :show_redactions => true }) + assert_response :success + assert_select "td", :text => "TOP SECRET", :count => 1 + assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1 + end + def test_not_found get old_way_path(0, 0) assert_response :not_found @@ -37,4 +181,14 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest assert_template :layout => "map" assert_select "#sidebar_content", /way #0 version 0 could not be found/ end + + private + + def create_redacted_way + create(:way, :with_history, :version => 2) do |way| + way_v1 = way.old_ways.find_by(:version => 1) + create(:old_way_tag, :old_way => way_v1, :k => "name", :v => "TOP SECRET") + way_v1.redact!(create(:redaction)) + end + end end