X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9143fd61e8ae268ec40837efdb2b7cae49783b4d..437eb1fa8a518e760d76e51a1ab6ddd20c39ffc9:/test/controllers/api/changesets_controller_test.rb diff --git a/test/controllers/api/changesets_controller_test.rb b/test/controllers/api/changesets_controller_test.rb index 1da53a704..c20b9bddc 100644 --- a/test/controllers/api/changesets_controller_test.rb +++ b/test/controllers/api/changesets_controller_test.rb @@ -33,26 +33,6 @@ module Api { :path => "/api/0.6/changeset/1/upload", :method => :post }, { :controller => "api/changesets", :action => "upload", :id => "1" } ) - assert_routing( - { :path => "/api/0.6/changeset/1/download", :method => :get }, - { :controller => "api/changesets", :action => "download", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/changeset/1/subscribe", :method => :post }, - { :controller => "api/changesets", :action => "subscribe", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/changeset/1/subscribe.json", :method => :post }, - { :controller => "api/changesets", :action => "subscribe", :id => "1", :format => "json" } - ) - assert_routing( - { :path => "/api/0.6/changeset/1/unsubscribe", :method => :post }, - { :controller => "api/changesets", :action => "unsubscribe", :id => "1" } - ) - assert_routing( - { :path => "/api/0.6/changeset/1/unsubscribe.json", :method => :post }, - { :controller => "api/changesets", :action => "unsubscribe", :id => "1", :format => "json" } - ) assert_routing( { :path => "/api/0.6/changeset/1/close", :method => :put }, { :controller => "api/changesets", :action => "close", :id => "1" } @@ -73,8 +53,8 @@ module Api user = create(:user) changeset = create(:changeset, :user => user) closed_changeset = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 1, 1, 0, 0, 0), :closed_at => Time.utc(2008, 1, 2, 0, 0, 0)) - changeset2 = create(:changeset, :min_lat => (5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (15 * GeoRecord::SCALE).round) - changeset3 = create(:changeset, :min_lat => (4.5 * GeoRecord::SCALE).round, :min_lon => (4.5 * GeoRecord::SCALE).round, :max_lat => (5 * GeoRecord::SCALE).round, :max_lon => (5 * GeoRecord::SCALE).round) + changeset2 = create(:changeset, :bbox => [5, 5, 15, 15]) + changeset3 = create(:changeset, :bbox => [4.5, 4.5, 5, 5]) get api_changesets_path(:bbox => "-10,-10, 10, 10") assert_response :success, "can't get changesets in bbox" @@ -647,9 +627,7 @@ module Api end def test_show_bbox_json - # test bbox attribute - changeset = create(:changeset, :min_lat => (-5 * GeoRecord::SCALE).round, :min_lon => (5 * GeoRecord::SCALE).round, - :max_lat => (15 * GeoRecord::SCALE).round, :max_lon => (12 * GeoRecord::SCALE).round) + changeset = create(:changeset, :bbox => [5, -5, 12, 15]) get api_changeset_path(changeset, :format => "json") assert_response :success, "cannot get first changeset" @@ -2112,9 +2090,7 @@ module Api create(:changeset, :user => user, :created_at => Time.now.utc - 7.days) # create a changeset that puts us near the initial size limit - changeset = create(:changeset, :user => user, - :min_lat => (-0.5 * GeoRecord::SCALE).round, :min_lon => (0.5 * GeoRecord::SCALE).round, - :max_lat => (0.5 * GeoRecord::SCALE).round, :max_lon => (2.5 * GeoRecord::SCALE).round) + changeset = create(:changeset, :user => user, :bbox => [0.5, -0.5, 2.5, 0.5]) # create authentication header auth_header = bearer_authorization_header user @@ -2184,7 +2160,7 @@ module Api assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get changeset_download_path(changeset_id) + get api_changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -2242,7 +2218,7 @@ module Api assert_response :success, "can't upload a diff from JOSM: #{@response.body}" - get changeset_download_path(changeset_id) + get api_changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -2297,7 +2273,7 @@ module Api assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get changeset_download_path(changeset_id) + get api_changeset_download_path(changeset_id) assert_response :success assert_select "osmChange", 1 @@ -2310,63 +2286,6 @@ module Api assert_select "osmChange>modify>way", 1 end - def test_changeset_download - changeset = create(:changeset) - node = create(:node, :with_history, :version => 1, :changeset => changeset) - tag = create(:old_node_tag, :old_node => node.old_nodes.find_by(:version => 1)) - node2 = create(:node, :with_history, :version => 1, :changeset => changeset) - _node3 = create(:node, :with_history, :deleted, :version => 1, :changeset => changeset) - _relation = create(:relation, :with_history, :version => 1, :changeset => changeset) - _relation2 = create(:relation, :with_history, :deleted, :version => 1, :changeset => changeset) - - get changeset_download_path(changeset) - - assert_response :success - - # FIXME: needs more assert_select tests - assert_select "osmChange[version='#{Settings.api_version}'][generator='#{Settings.generator}']" do - assert_select "create", :count => 5 - assert_select "create>node[id='#{node.id}'][visible='#{node.visible?}'][version='#{node.version}']" do - assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" - end - assert_select "create>node[id='#{node2.id}']" - end - end - - test "sorts downloaded elements by timestamp" do - changeset = create(:changeset) - node1 = create(:old_node, :version => 2, :timestamp => "2020-02-01", :changeset => changeset) - node0 = create(:old_node, :version => 2, :timestamp => "2020-01-01", :changeset => changeset) - - get changeset_download_path(changeset) - assert_response :success - assert_dom "modify", :count => 2 do |modify| - assert_dom modify[0], ">node", :count => 1 do |node| - assert_dom node, ">@id", node0.node_id.to_s - end - assert_dom modify[1], ">node", :count => 1 do |node| - assert_dom node, ">@id", node1.node_id.to_s - end - end - end - - test "sorts downloaded elements by version" do - changeset = create(:changeset) - node1 = create(:old_node, :version => 3, :timestamp => "2020-01-01", :changeset => changeset) - node0 = create(:old_node, :version => 2, :timestamp => "2020-01-01", :changeset => changeset) - - get changeset_download_path(changeset) - assert_response :success - assert_dom "modify", :count => 2 do |modify| - assert_dom modify[0], ">node", :count => 1 do |node| - assert_dom node, ">@id", node0.node_id.to_s - end - assert_dom modify[1], ">node", :count => 1 do |node| - assert_dom node, ">@id", node1.node_id.to_s - end - end - end - ## # check that the bounding box of a changeset gets updated correctly # FIXME: This should really be moded to a integration test due to the with_controller @@ -2564,122 +2483,6 @@ module Api "element limit.") end - ## - # check that the changeset download for a changeset with a redacted - # element in it doesn't contain that element. - def test_diff_download_redacted - changeset = create(:changeset) - node = create(:node, :with_history, :version => 2, :changeset => changeset) - node_v1 = node.old_nodes.find_by(:version => 1) - node_v1.redact!(create(:redaction)) - - get changeset_download_path(changeset) - assert_response :success - - assert_select "osmChange", 1 - # this changeset contains the node in versions 1 & 2, but 1 should - # be hidden. - assert_select "osmChange node[id='#{node.id}']", 1 - assert_select "osmChange node[id='#{node.id}'][version='1']", 0 - end - - ## - # test subscribe success - def test_subscribe_success - auth_header = bearer_authorization_header - changeset = create(:changeset, :closed) - - assert_difference "changeset.subscribers.count", 1 do - post api_changeset_subscribe_path(changeset), :headers => auth_header - end - assert_response :success - - # not closed changeset - changeset = create(:changeset) - assert_difference "changeset.subscribers.count", 1 do - post api_changeset_subscribe_path(changeset), :headers => auth_header - end - assert_response :success - end - - ## - # test subscribe fail - def test_subscribe_fail - user = create(:user) - - # unauthorized - changeset = create(:changeset, :closed) - assert_no_difference "changeset.subscribers.count" do - post api_changeset_subscribe_path(changeset) - end - assert_response :unauthorized - - auth_header = bearer_authorization_header user - - # bad changeset id - assert_no_difference "changeset.subscribers.count" do - post api_changeset_subscribe_path(999111), :headers => auth_header - end - assert_response :not_found - - # trying to subscribe when already subscribed - changeset = create(:changeset, :closed) - changeset.subscribers.push(user) - assert_no_difference "changeset.subscribers.count" do - post api_changeset_subscribe_path(changeset), :headers => auth_header - end - assert_response :conflict - end - - ## - # test unsubscribe success - def test_unsubscribe_success - user = create(:user) - auth_header = bearer_authorization_header user - changeset = create(:changeset, :closed) - changeset.subscribers.push(user) - - assert_difference "changeset.subscribers.count", -1 do - post api_changeset_unsubscribe_path(changeset), :headers => auth_header - end - assert_response :success - - # not closed changeset - changeset = create(:changeset) - changeset.subscribers.push(user) - - assert_difference "changeset.subscribers.count", -1 do - post api_changeset_unsubscribe_path(changeset), :headers => auth_header - end - assert_response :success - end - - ## - # test unsubscribe fail - def test_unsubscribe_fail - # unauthorized - changeset = create(:changeset, :closed) - assert_no_difference "changeset.subscribers.count" do - post api_changeset_unsubscribe_path(changeset) - end - assert_response :unauthorized - - auth_header = bearer_authorization_header - - # bad changeset id - assert_no_difference "changeset.subscribers.count" do - post api_changeset_unsubscribe_path(999111), :headers => auth_header - end - assert_response :not_found - - # trying to unsubscribe when not subscribed - changeset = create(:changeset, :closed) - assert_no_difference "changeset.subscribers.count" do - post api_changeset_unsubscribe_path(changeset), :headers => auth_header - end - assert_response :not_found - end - private ##