cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move changeset XML generation to a view

Browse source
This commit is contained in:
Frederik Ramm 2019-03-01 01:11:19 +01:00 • committed by Tom Hughes
parent 94b59f4403
commit 538bfed8a6
7 changed files with 102 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

26
test/controllers/api/changesets_controller_test.rb
View file

@ -1674,7 +1674,7 @@ CHANGESET
changeset = create(:changeset, :user => user)
## First try with a non-public user
new_changeset = private_changeset.to_xml
new_changeset = create_changeset_xml(user: private_user)
new_tag = XML::Node.new "tag"
new_tag["k"] = "tagtesting"
new_tag["v"] = "valuetesting"
@ -1695,8 +1695,7 @@ CHANGESET
assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
## Now try with the public user
create(:changeset_tag, :changeset => changeset)
new_changeset = changeset.to_xml
new_changeset = create_changeset_xml(id: 1)
new_tag = XML::Node.new "tag"
new_tag["k"] = "tagtesting"
new_tag["v"] = "valuetesting"
@ -1718,7 +1717,7 @@ CHANGESET
assert_response :success
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>tag", 2
assert_select "osm>changeset>tag", 1
assert_select "osm>changeset>tag[k='tagtesting'][v='valuetesting']", 1
end
@ -1729,7 +1728,7 @@ CHANGESET
basic_authorization create(:user).email, "test"
changeset = create(:changeset)
new_changeset = changeset.to_xml
new_changeset = create_changeset_xml(user: changeset.user, id: changeset.id)
new_tag = XML::Node.new "tag"
new_tag["k"] = "testing"
new_tag["v"] = "testing"
@ -1959,5 +1958,22 @@ CHANGESET
xml.find("//osm/way").first[name] = value.to_s
xml
end
##
# build XML for changesets
def create_changeset_xml(user: nil, id: nil)
root = XML::Document.new
root.root = XML::Node.new "osm"
cs = XML::Node.new "changeset"
if user
cs["user"] = user.display_name
cs["uid"] = user.id.to_s
end
if id
cs["id"] = id.to_s
end
root.root << cs
root
end
end
end