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

Format closed_at correctly in changeset API responses

Browse source 
Fixes #2195
This commit is contained in:
Tom Hughes 2019-03-30 15:35:37 +00:00
parent 2954691be3
commit 79bda7a8ed
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/api/changesets/_changeset.builder
View file

@ -7,7 +7,7 @@ attrs = {
"comments_count" => changeset.comments.length,
"changes_count" => changeset.num_changes
}
attrs["closed_at"] = changeset.closed_at unless changeset.is_open?
attrs["closed_at"] = changeset.closed_at.xmlschema unless changeset.is_open?
changeset.bbox.to_unscaled.add_bounds_to(attrs, "_") if changeset.bbox.complete?
# user attributes

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

@ -132,31 +132,40 @@ module Api
# check that the changeset can be shown and returns the correct
# document structure.
def test_show
changeset_id = create(:changeset).id
changeset = create(:changeset)
get :show, :params => { :id => changeset_id }
get :show, :params => { :id => changeset.id }
assert_response :success, "cannot get first changeset"
assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
assert_select "osm>changeset[id='#{changeset_id}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "true"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
assert_select "osm>changeset>@closed_at", 0
assert_select "osm>changeset>discussion", 0
get :show, :params => { :id => changeset_id, :include_discussion => true }
get :show, :params => { :id => changeset.id, :include_discussion => true }
assert_response :success, "cannot get first changeset with comments"
assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
assert_select "osm>changeset[id='#{changeset_id}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "true"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
assert_select "osm>changeset>@closed_at", 0
assert_select "osm>changeset>discussion", 1
assert_select "osm>changeset>discussion>comment", 0
changeset_id = create(:changeset, :closed).id
create_list(:changeset_comment, 3, :changeset_id => changeset_id)
changeset = create(:changeset, :closed)
create_list(:changeset_comment, 3, :changeset_id => changeset.id)
get :show, :params => { :id => changeset_id, :include_discussion => true }
get :show, :params => { :id => changeset.id, :include_discussion => true }
assert_response :success, "cannot get closed changeset with comments"
assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1
assert_select "osm>changeset[id='#{changeset_id}']", 1
assert_select "osm>changeset[id='#{changeset.id}']", 1
assert_select "osm>changeset>@open", "false"
assert_select "osm>changeset>@created_at", changeset.created_at.xmlschema
assert_select "osm>changeset>@closed_at", changeset.closed_at.xmlschema
assert_select "osm>changeset>discussion", 1
assert_select "osm>changeset>discussion>comment", 3
end