X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0dd0f1881db639b968ea9f8d864bfc95efed279d..491da055847c0b0184016606c93a65eeae38ce80:/test/functional/way_controller_test.rb?ds=sidebyside diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb index 9c32ae904..a4b5a192a 100644 --- a/test/functional/way_controller_test.rb +++ b/test/functional/way_controller_test.rb @@ -4,6 +4,35 @@ require 'way_controller' class WayControllerTest < ActionController::TestCase api_fixtures + ## + # test all routes which lead to this controller + def test_routes + assert_routing( + { :path => "/api/0.6/way/create", :method => :put }, + { :controller => "way", :action => "create" } + ) + assert_routing( + { :path => "/api/0.6/way/1/full", :method => :get }, + { :controller => "way", :action => "full", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/way/1", :method => :get }, + { :controller => "way", :action => "read", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/way/1", :method => :put }, + { :controller => "way", :action => "update", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/way/1", :method => :delete }, + { :controller => "way", :action => "delete", :id => "1" } + ) + assert_routing( + { :path => "/api/0.6/ways", :method => :get }, + { :controller => "way", :action => "ways" } + ) + end + # ------------------------------------- # Test reading ways. # ------------------------------------- @@ -41,11 +70,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 @@ -164,6 +192,7 @@ class WayControllerTest < ActionController::TestCase # expect failure assert_response :precondition_failed, "way upload with invalid node did not return 'precondition failed'" + assert_equal "Precondition failed: Way requires the nodes with id in (0), which either do not exist, or are not visible.", @response.body # create a way with no nodes content "" + @@ -172,6 +201,7 @@ class WayControllerTest < ActionController::TestCase # expect failure assert_response :precondition_failed, "way upload with no node did not return 'precondition failed'" + assert_equal "Precondition failed: Cannot create way: data is invalid.", @response.body # create a way inside a closed changeset content "" + @@ -180,6 +210,16 @@ class WayControllerTest < ActionController::TestCase # expect failure assert_response :conflict, "way upload to closed changeset did not return 'conflict'" + + # create a way with a tag which is too long + content "" + + "" + + "" + + "" + put :create + # expect failure + assert_response :bad_request, + "way upload to with too long tag did not return 'bad_request'" end # ------------------------------------- @@ -199,7 +239,7 @@ class WayControllerTest < ActionController::TestCase assert_response :forbidden # Now try without having a changeset - content "" + content "" delete :delete, :id => current_ways(:visible_way).id assert_response :forbidden @@ -250,7 +290,7 @@ class WayControllerTest < ActionController::TestCase assert_response :bad_request # Now try without having a changeset - content "" + content "" delete :delete, :id => current_ways(:visible_way).id assert_response :bad_request @@ -286,6 +326,7 @@ class WayControllerTest < ActionController::TestCase delete :delete, :id => current_ways(:used_way).id assert_response :precondition_failed, "shouldn't be able to delete a way used in a relation (#{@response.body})" + assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body # this won't work since the way never existed delete :delete, :id => 0 @@ -336,7 +377,7 @@ class WayControllerTest < ActionController::TestCase put :update, :id => current_ways(:visible_way).id assert_response :bad_request, "adding a duplicate tag to a way should fail with 'bad request'" - assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}.", @response.body + assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body end ## @@ -383,7 +424,7 @@ class WayControllerTest < ActionController::TestCase put :update, :id => current_ways(:visible_way).id assert_response :bad_request, "adding new duplicate tags to a way should fail with 'bad request'" - assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate.", @response.body + assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate", @response.body end @@ -423,7 +464,7 @@ class WayControllerTest < ActionController::TestCase put :create assert_response :bad_request, "adding new duplicate tags to a way should fail with 'bad request'" - assert_equal "Element way/ has duplicate tags with key addr:housenumber.", @response.body + assert_equal "Element way/ has duplicate tags with key addr:housenumber", @response.body end ## @@ -442,7 +483,7 @@ class WayControllerTest < ActionController::TestCase current_ways(:used_way).id ] found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i } - assert_equal expected_way_ids, found_way_ids, + assert_equal expected_way_ids.sort, found_way_ids.sort, "expected ways for node #{current_nodes(:used_node_1).id} did not match found" # check the full ways to ensure we're not missing anything