{ :path => "/api/0.6/changesets", :method => :post },
{ :controller => "api/changesets", :action => "create" }
)
- assert_routing(
- { :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", :method => :get },
{ :controller => "api/changesets", :action => "show", :id => "1" }
{ :path => "/api/0.6/changeset/1.json", :method => :get },
{ :controller => "api/changesets", :action => "show", :id => "1", :format => "json" }
)
+ assert_routing(
+ { :path => "/api/0.6/changeset/1", :method => :put },
+ { :controller => "api/changesets", :action => "update", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1/upload", :method => :post },
+ { :controller => "api/changesets", :action => "upload", :id => "1" }
+ )
assert_routing(
{ :path => "/api/0.6/changeset/1/subscribe", :method => :post },
{ :controller => "api/changesets", :action => "subscribe", :id => "1" }
{ :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", :method => :put },
- { :controller => "api/changesets", :action => "update", :id => "1" }
- )
assert_routing(
{ :path => "/api/0.6/changeset/1/close", :method => :put },
{ :controller => "api/changesets", :action => "close", :id => "1" }
def test_show
changeset = create(:changeset)
- get changeset_show_path(changeset)
+ get api_changeset_path(changeset)
assert_response :success, "cannot get first changeset"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
assert_dom "> discussion", 0
end
- get changeset_show_path(changeset), :params => { :include_discussion => true }
+ get api_changeset_path(changeset, :include_discussion => true)
assert_response :success, "cannot get first changeset with comments"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
changeset = create(:changeset, :closed)
comment1, comment2, comment3 = create_list(:changeset_comment, 3, :changeset_id => changeset.id)
- get changeset_show_path(changeset), :params => { :include_discussion => true }
+ get api_changeset_path(changeset, :include_discussion => true)
assert_response :success, "cannot get closed changeset with comments"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1 do
comment2.update(:visible => false)
changeset.reload
- get changeset_show_path(changeset), :params => { :include_discussion => true }
+ get api_changeset_path(changeset, :include_discussion => true)
assert_response :success, "cannot get closed changeset with comments"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
end
# one hidden comment not included because no permissions
- get changeset_show_path(changeset), :params => { :include_discussion => true, :show_hidden_comments => true }
+ get api_changeset_path(changeset, :include_discussion => true, :show_hidden_comments => true)
assert_response :success, "cannot get closed changeset with comments"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
# one hidden comment shown to moderators
moderator_user = create(:moderator_user)
auth_header = bearer_authorization_header moderator_user
- get changeset_show_path(changeset), :params => { :include_discussion => true, :show_hidden_comments => true },
- :headers => auth_header
+ get api_changeset_path(changeset, :include_discussion => true, :show_hidden_comments => true), :headers => auth_header
assert_response :success, "cannot get closed changeset with comments"
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
create(:changeset_tag, :changeset => changeset, :k => "created_by", :v => "JOSM/1.5 (18364)")
create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset comment")
- get changeset_show_path(changeset)
+ get api_changeset_path(changeset)
assert_response :success
assert_dom "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
def test_show_json
changeset = create(:changeset)
- get changeset_show_path(changeset), :params => { :format => "json" }
+ get api_changeset_path(changeset, :format => "json")
assert_response :success, "cannot get first changeset"
js = ActiveSupport::JSON.decode(@response.body)
assert_equal changeset.user.id, js["changeset"]["uid"]
assert_equal changeset.user.display_name, js["changeset"]["user"]
- get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
+ get api_changeset_path(changeset, :format => "json", :include_discussion => true)
assert_response :success, "cannot get first changeset with comments"
js = ActiveSupport::JSON.decode(@response.body)
changeset = create(:changeset, :closed)
comment0, comment1, comment2 = create_list(:changeset_comment, 3, :changeset_id => changeset.id)
- get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
+ get api_changeset_path(changeset, :format => "json", :include_discussion => true)
assert_response :success, "cannot get closed changeset with comments"
js = ActiveSupport::JSON.decode(@response.body)
comment1.update(:visible => false)
changeset.reload
- get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true }
+ get api_changeset_path(changeset, :format => "json", :include_discussion => true)
assert_response :success, "cannot get closed changeset with comments"
js = ActiveSupport::JSON.decode(@response.body)
assert js["changeset"]["comments"][1]["visible"]
# one hidden comment not included because no permissions
- get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true, :show_hidden_comments => true }
+ get api_changeset_path(changeset, :format => "json", :include_discussion => true, :show_hidden_comments => true)
assert_response :success, "cannot get closed changeset with comments"
js = ActiveSupport::JSON.decode(@response.body)
# one hidden comment shown to moderators
moderator_user = create(:moderator_user)
auth_header = bearer_authorization_header moderator_user
- get changeset_show_path(changeset), :params => { :format => "json", :include_discussion => true, :show_hidden_comments => true },
- :headers => auth_header
+ get api_changeset_path(changeset, :format => "json", :include_discussion => true, :show_hidden_comments => true), :headers => auth_header
assert_response :success, "cannot get closed changeset with comments"
js = ActiveSupport::JSON.decode(@response.body)
create(:changeset_tag, :changeset => changeset, :k => "created_by", :v => "JOSM/1.5 (18364)")
create(:changeset_tag, :changeset => changeset, :k => "comment", :v => "changeset comment")
- get changeset_show_path(changeset, :format => "json")
+ get api_changeset_path(changeset, :format => "json")
assert_response :success
js = ActiveSupport::JSON.decode(@response.body)
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)
- get changeset_show_path(changeset), :params => { :format => "json" }
+ get api_changeset_path(changeset, :format => "json")
assert_response :success, "cannot get first changeset"
js = ActiveSupport::JSON.decode(@response.body)
# check that a changeset that doesn't exist returns an appropriate message
def test_show_not_found
[0, -32, 233455644, "afg", "213"].each do |id|
- get changeset_show_path(id)
+ get api_changeset_path(id)
assert_response :not_found, "should get a not found"
rescue ActionController::UrlGenerationError => e
assert_match(/No route matches/, e.to_s)
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
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
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
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
end
# get the bounding box back from the changeset
- get changeset_show_path(changeset_id)
+ get api_changeset_path(changeset_id)
assert_response :success, "Couldn't read back changeset."
assert_select "osm>changeset[min_lon='0.1000000']", 1
assert_select "osm>changeset[max_lon='0.1000000']", 1
end
# get the bounding box back from the changeset
- get changeset_show_path(changeset_id)
+ get api_changeset_path(changeset_id)
assert_response :success, "Couldn't read back changeset for the second time."
assert_select "osm>changeset[min_lon='0.1000000']", 1
assert_select "osm>changeset[max_lon='0.2000000']", 1
end
# get the bounding box back from the changeset
- get changeset_show_path(changeset_id)
+ get api_changeset_path(changeset_id)
assert_response :success, "Couldn't read back changeset for the third time."
assert_select "osm>changeset[min_lon='0.1000000']", 1
assert_select "osm>changeset[max_lon='0.3000000']", 1
new_changeset.find("//osm/changeset").first << new_tag
# try without any authorization
- put changeset_show_path(private_changeset), :params => new_changeset.to_s
+ put api_changeset_path(private_changeset), :params => new_changeset.to_s
assert_response :unauthorized
# try with the wrong authorization
auth_header = bearer_authorization_header
- put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header
+ put api_changeset_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header
assert_response :conflict
# now this should get an unauthorized
auth_header = bearer_authorization_header private_user
- put changeset_show_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header
+ put api_changeset_path(private_changeset), :params => new_changeset.to_s, :headers => auth_header
assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
## Now try with the public user
new_changeset.find("//osm/changeset").first << new_tag
# try without any authorization
- put changeset_show_path(changeset), :params => new_changeset.to_s
+ put api_changeset_path(changeset), :params => new_changeset.to_s
assert_response :unauthorized
# try with the wrong authorization
auth_header = bearer_authorization_header
- put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header
+ put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header
assert_response :conflict
# now this should work...
auth_header = bearer_authorization_header user
- put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header
+ put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header
assert_response :success
assert_select "osm>changeset[id='#{changeset.id}']", 1
new_tag["v"] = "testing"
new_changeset.find("//osm/changeset").first << new_tag
- put changeset_show_path(changeset), :params => new_changeset.to_s, :headers => auth_header
+ put api_changeset_path(changeset), :params => new_changeset.to_s, :headers => auth_header
assert_response :conflict
end
"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
projects / rails.git / blobdiff