Merging 17824:17845 from trunk to blocking branch.

This commit is contained in:
Matt Amos 2009-09-29 10:23:31 +00:00
commit 09c5740b5b
60 changed files with 22385 additions and 15820 deletions

View file

@ -41,11 +41,10 @@ class WayControllerTest < ActionController::TestCase
assert_select "osm way[id=#{way.id}][version=#{way.version}][visible=#{way.visible}]", 1
# check that each node in the way appears once in the output as a
# reference and as the node element. note the slightly dodgy assumption
# that nodes appear only once. this is currently the case with the
# fixtures, but it doesn't have to be.
# reference and as the node element.
way.nodes.each do |n|
assert_select "osm way nd[ref=#{n.id}]", 1
count = (way.nodes - (way.nodes - [n])).length
assert_select "osm way nd[ref=#{n.id}]", count
assert_select "osm node[id=#{n.id}][version=#{n.version}][lat=#{n.lat}][lon=#{n.lon}]", 1
end
end