X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5047ec403db94b0d371a9a10b56801bc0a3fcf0a..437eb1fa8a518e760d76e51a1ab6ddd20c39ffc9:/test/controllers/changesets_controller_test.rb diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index 2e701f248..007a5d679 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -80,7 +80,10 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest # This should report an error def test_index_invalid_xhr %w[-1 0 fred].each do |id| - get history_path(:format => "html", :list => "1", :max_id => id) + get history_path(:format => "html", :list => "1", :before => id) + assert_redirected_to :controller => :errors, :action => :bad_request + + get history_path(:format => "html", :list => "1", :after => id) assert_redirected_to :controller => :errors, :action => :bad_request end end @@ -88,8 +91,8 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # This should display the last 20 changesets closed in a specific area def test_index_bbox - changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 50000000, :max_lat => 50000001, :min_lon => 50000000, :max_lon => 50000001) - other_changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 0, :max_lat => 1, :min_lon => 0, :max_lon => 1) + changesets = create_list(:changeset, 10, :num_changes => 1, :bbox => [5, 5, 5, 5]) + other_changesets = create_list(:changeset, 10, :num_changes => 1, :bbox => [0, 0, 1, 1]) # First check they all show up without a bbox parameter get history_path(:format => "html", :list => "1"), :xhr => true @@ -114,6 +117,127 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest check_index_result(changesets) end + def test_index_bbox_across_antimeridian_with_changesets_close_to_antimeridian + west_of_antimeridian_changeset = create(:changeset, :num_changes => 1, :bbox => [176, 0, 178, 1]) + east_of_antimeridian_changeset = create(:changeset, :num_changes => 1, :bbox => [-178, 0, -176, 1]) + + get history_path(:format => "html", :list => "1") + assert_response :success + check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset]) + + # negative longitudes + get history_path(:format => "html", :list => "1", :bbox => "-190,-10,-170,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "-183,-10,-177,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "-181,-10,-177,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "-183,-10,-179,10") + assert_response :success + check_index_result([west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "-181,-10,-179,10") + assert_response :success + check_index_result([]) + + # positive longitudes + get history_path(:format => "html", :list => "1", :bbox => "170,-10,190,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "177,-10,183,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset, west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "177,-10,181,10") + assert_response :success + check_index_result([west_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "179,-10,183,10") + assert_response :success + check_index_result([east_of_antimeridian_changeset]) + + get history_path(:format => "html", :list => "1", :bbox => "179,-10,181,10") + assert_response :success + check_index_result([]) + end + + def test_index_bbox_across_antimeridian_with_changesets_around_globe + changeset1 = create(:changeset, :num_changes => 1, :bbox => [-150, 40, -140, 50]) + changeset2 = create(:changeset, :num_changes => 1, :bbox => [-30, -30, -20, -20]) + changeset3 = create(:changeset, :num_changes => 1, :bbox => [10, 60, 20, 70]) + changeset4 = create(:changeset, :num_changes => 1, :bbox => [150, -60, 160, -50]) + + # no bbox, get all changesets + get history_path(:format => "html", :list => "1") + assert_response :success + check_index_result([changeset4, changeset3, changeset2, changeset1]) + + # large enough bbox within normal range + get history_path(:format => "html", :list => "1", :bbox => "-170,-80,170,80") + assert_response :success + check_index_result([changeset4, changeset3, changeset2, changeset1]) + + # bbox for [1,2] within normal range + get history_path(:format => "html", :list => "1", :bbox => "-160,-80,0,80") + assert_response :success + check_index_result([changeset2, changeset1]) + + # bbox for [1,4] containing antimeridian with negative lon + get history_path(:format => "html", :list => "1", :bbox => "-220,-80,-100,80") + assert_response :success + check_index_result([changeset4, changeset1]) + + # bbox for [1,4] containing antimeridian with positive lon + get history_path(:format => "html", :list => "1", :bbox => "100,-80,220,80") + assert_response :success + check_index_result([changeset4, changeset1]) + + # large enough bbox outside normal range + get history_path(:format => "html", :list => "1", :bbox => "-220,-80,220,80") + assert_response :success + check_index_result([changeset4, changeset3, changeset2, changeset1]) + end + + ## + # Test that -180..180 longitudes don't result in empty bbox + def test_index_bbox_entire_world + changeset = create(:changeset, :num_changes => 1, :bbox => [30, 60, 31, 61]) + + get history_path(:format => "html", :list => "1", :bbox => "-180,-80,-180,80") + assert_response :success + check_index_result([]) + + get history_path(:format => "html", :list => "1", :bbox => "180,-80,180,80") + assert_response :success + check_index_result([]) + + get history_path(:format => "html", :list => "1", :bbox => "-180,-80,180,80") + assert_response :success + check_index_result([changeset]) + end + + ## + # Test that -270..270 longitudes don't result in 90..-90 bbox + def test_index_bbox_larger_than_entire_world + changeset1 = create(:changeset, :num_changes => 1, :bbox => [30, 60, 31, 61]) + changeset2 = create(:changeset, :num_changes => 1, :bbox => [130, 60, 131, 61]) + + get history_path(:format => "html", :list => "1", :bbox => "-90,-80,90,80") + assert_response :success + check_index_result([changeset1]) + + get history_path(:format => "html", :list => "1", :bbox => "-270,-80,270,80") + assert_response :success + check_index_result([changeset2, changeset1]) + end + ## # Checks the display of the user changesets listing def test_index_user @@ -221,21 +345,38 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # Check that we can't request later pages of the changesets index - def test_index_max_id - changeset = create(:changeset, :num_changes => 1) - _changeset2 = create(:changeset, :num_changes => 1) + def test_index_before_id + changeset1 = create(:changeset, :num_changes => 1) + changeset2 = create(:changeset, :num_changes => 1) - get history_path(:format => "html", :max_id => changeset.id), :xhr => true + get history_path(:format => "html", :before => changeset2.id), :xhr => true assert_response :success assert_template "history" assert_template :layout => "xhr" assert_select "h2", :text => "Changesets", :count => 1 - get history_path(:format => "html", :list => "1", :max_id => changeset.id), :xhr => true + get history_path(:format => "html", :list => "1", :before => changeset2.id), :xhr => true assert_response :success assert_template "index" - check_index_result([changeset]) + check_index_result [changeset1] + end + + def test_index_after_id + changeset1 = create(:changeset, :num_changes => 1) + changeset2 = create(:changeset, :num_changes => 1) + + get history_path(:format => "html", :after => changeset1.id), :xhr => true + assert_response :success + assert_template "history" + assert_template :layout => "xhr" + assert_select "h2", :text => "Changesets", :count => 1 + + get history_path(:format => "html", :list => "1", :after => changeset1.id), :xhr => true + assert_response :success + assert_template "index" + + check_index_result [changeset2] end ## @@ -259,7 +400,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest sidebar_browse_check :changeset_path, changeset.id, "changesets/show" assert_dom "h2", :text => "Changeset: #{changeset.id}" assert_dom "p", :text => "tested-changeset-comment" - assert_dom "li#c#{changeset_comment.id}" do + assert_dom "article#c#{changeset_comment.id}" do assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/ assert_dom "a[href='#{user_path(commenting_user)}']" end @@ -369,12 +510,12 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # This should display the last 20 changesets closed in a specific area def test_feed_bbox - changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE) + changeset = create(:changeset, :num_changes => 1, :bbox => [5, 5, 5, 5]) create(:changeset_tag, :changeset => changeset) create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/") - closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE) - _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE) - _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE) + closed_changeset = create(:changeset, :closed, :num_changes => 1, :bbox => [5, 5, 5, 5]) + _elsewhere_changeset = create(:changeset, :num_changes => 1, :bbox => [-5, -5, -5, -5]) + _empty_changeset = create(:changeset, :num_changes => 0, :bbox => [5, 5, 5, 5]) get history_feed_path(:format => :atom, :bbox => "4.5,4.5,5.5,5.5") assert_response :success @@ -411,8 +552,13 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # Check that we can't request later pages of the changesets feed - def test_feed_max_id - get history_feed_path(:format => "atom", :max_id => 100) + def test_feed_before + get history_feed_path(:format => "atom", :before => 100) + assert_redirected_to :action => :feed + end + + def test_feed_after + get history_feed_path(:format => "atom", :after => 100) assert_redirected_to :action => :feed end