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

Node controller wasn't using the right name for an exception class.

Browse source
This commit is contained in:
Matt Amos 2009-08-05 11:28:49 +00:00
parent 55e8611653
commit e93becd304
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/node_controller.rb
View file

@ -38,7 +38,7 @@ class NodeController < ApplicationController
new_node = Node.from_xml(request.raw_post)
unless new_node and new_node.id == node.id
raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
node.update_from(new_node, @user)
render :text => node.version.to_s, :content_type => "text/plain"
@ -52,7 +52,7 @@ class NodeController < ApplicationController
new_node = Node.from_xml(request.raw_post)
unless new_node and new_node.id == node.id
raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
raise OSM::APIBadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})")
end
node.delete_with_history!(new_node, @user)
render :text => node.version.to_s, :content_type => "text/plain"
@ -63,7 +63,7 @@ class NodeController < ApplicationController
ids = params['nodes'].split(',').collect { |n| n.to_i }
if ids.length == 0
raise OSM::BadUserInput.new("No nodes were given to search for")
raise OSM::APIBadUserInput.new("No nodes were given to search for")
end
doc = OSM::API.new.get_xml_doc

15
test/functional/node_controller_test.rb
View file

@ -178,6 +178,12 @@ class NodeControllerTest < ActionController::TestCase
delete :delete, :id => current_nodes(:visible_node).id
assert_response :conflict
# try to delete a node with a different ID
content(nodes(:public_visible_node).to_xml)
delete :delete, :id => current_nodes(:visible_node).id
assert_response :bad_request,
"should not be able to delete a node with a different ID from the XML"
# valid delete now takes a payload
content(nodes(:public_visible_node).to_xml)
delete :delete, :id => current_nodes(:public_visible_node).id
@ -271,9 +277,6 @@ class NodeControllerTest < ActionController::TestCase
content current_nodes(:visible_node).to_xml
put :update, :id => current_nodes(:visible_node).id
assert_require_public_data "should have failed with a forbidden when data isn't public"
## Finally test with the public user
@ -344,6 +347,12 @@ class NodeControllerTest < ActionController::TestCase
assert_response :conflict,
"should not be able to put 'p1r4at3s!' in the version field"
## try an update with the wrong ID
content current_nodes(:public_visible_node).to_xml
put :update, :id => current_nodes(:visible_node).id
assert_response :bad_request,
"should not be able to update a node with a different ID from the XML"
## finally, produce a good request which should work
content current_nodes(:public_visible_node).to_xml
put :update, :id => current_nodes(:public_visible_node).id