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

Fixed bug #1816 - the timeout updating logic should have been in a before_save handler, not in save_with_tags.

Browse source
This commit is contained in:
Matt Amos 2009-05-12 13:54:37 +00:00
parent ed68d524de
commit 1ceb4ab9ba
5 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/functional/amf_controller_test.rb
View file

@ -325,7 +325,8 @@ class AmfControllerTest < ActionController::TestCase
# AMF Write tests
def test_putpoi_update_valid
nd = current_nodes(:visible_node)
amf_content "putpoi", "/1", ["test@openstreetmap.org:test", nd.changeset_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]
cs_id = changesets(:public_user_first_change).id
amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]
post :amf_write
assert_response :success
amf_parse_response
@ -339,7 +340,7 @@ class AmfControllerTest < ActionController::TestCase
# Now try to update again, with a different lat/lon, using the updated version number
lat = nd.lat+0.1
lon = nd.lon-0.1
amf_content "putpoi", "/2", ["test@openstreetmap.org:test", nd.changeset_id, nd.version+1, nd.id, lon, lat, nd.tags, nd.visible]
amf_content "putpoi", "/2", ["test@example.com:test", cs_id, nd.version+1, nd.id, lon, lat, nd.tags, nd.visible]
post :amf_write
assert_response :success
amf_parse_response
@ -360,9 +361,9 @@ class AmfControllerTest < ActionController::TestCase
lat = rand(100)-50 + rand
lon = rand(100)-50 + rand
# normal user has a changeset open
changeset = changesets(:normal_user_first_change)
changeset = changesets(:public_user_first_change)
amf_content "putpoi", "/1", ["test@openstreetmap.org:test", changeset.id, nil, nil, lon, lat, {}, nil]
amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, {}, nil]
post :amf_write
assert_response :success
amf_parse_response
@ -399,9 +400,9 @@ class AmfControllerTest < ActionController::TestCase
lat = rand(100)-50 + rand
lon = rand(100)-50 + rand
# normal user has a changeset open
changeset = changesets(:normal_user_first_change)
changeset = changesets(:public_user_first_change)
amf_content "putpoi", "/2", ["test@openstreetmap.org:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
amf_content "putpoi", "/2", ["test@example.com:test", changeset.id, nil, nil, lon, lat, { "key" => "value", "ping" => "pong" }, nil]
post :amf_write
assert_response :success
amf_parse_response

4
test/functional/changeset_controller_test.rb
View file

@ -128,7 +128,7 @@ class ChangesetControllerTest < ActionController::TestCase
# test that it really is closed now
cs = Changeset.find(cs_id)
assert(!cs.is_open?,
"changeset should be closed now (#{cs.closed_at} > #{Time.now}.")
"changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.")
end
##
@ -1295,7 +1295,7 @@ EOF
get :query, :time => '2007-12-31T23:59Z,2008-01-01T00:01Z'
assert_response :success, "can't get changesets by time-range"
assert_changesets [1,4,5,6]
assert_changesets [1,5,6]
get :query, :open => 'true'
assert_response :success, "can't get changesets by open-ness"