Merge branch 'master' into openstreetbugs

[rails.git] / test / functional / way_controller_test.rb

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 9c32ae90400508d7d3654fec1021833fd4ae6627..3452be6d04a120ed771a2a1a1b05367e36117ab0 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -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 
       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|
       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
         assert_select "osm node[id=#{n.id}][version=#{n.version}][lat=#{n.lat}][lon=#{n.lon}]", 1
       end
     end


@@ -164,6 +163,7 @@ class WayControllerTest < ActionController::TestCase
     # expect failure
     assert_response :precondition_failed, 
         "way upload with invalid node did not return 'precondition failed'"
     # 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 "<osm><way changeset='#{open_changeset_id}'>" +
 
     # create a way with no nodes
     content "<osm><way changeset='#{open_changeset_id}'>" +


@@ -172,6 +172,7 @@ class WayControllerTest < ActionController::TestCase
     # expect failure
     assert_response :precondition_failed, 
         "way upload with no node did not return 'precondition failed'"
     # 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 "<osm><way changeset='#{closed_changeset_id}'>" +
 
     # create a way inside a closed changeset
     content "<osm><way changeset='#{closed_changeset_id}'>" +


@@ -180,6 +181,16 @@ class WayControllerTest < ActionController::TestCase
     # expect failure
     assert_response :conflict, 
         "way upload to closed changeset did not return 'conflict'"    
     # 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 "<osm><way changeset='#{open_changeset_id}'>" +
+      "<nd ref='#{nid1}'/>" +
+      "<tag k='foo' v='#{'x'*256}'/>" +
+      "</way></osm>"
+    put :create
+    # expect failure
+    assert_response :bad_request, 
+        "way upload to with too long tag did not return 'bad_request'"

   end
 
   # -------------------------------------
   end
 
   # -------------------------------------


@@ -199,7 +210,7 @@ class WayControllerTest < ActionController::TestCase
     assert_response :forbidden
     
     # Now try without having a changeset
     assert_response :forbidden
     
     # Now try without having a changeset

-    content "<osm><way id='#{current_ways(:visible_way).id}'></osm>"
+    content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"

     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
     
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
     


@@ -250,7 +261,7 @@ class WayControllerTest < ActionController::TestCase
     assert_response :bad_request
     
     # Now try without having a changeset
     assert_response :bad_request
     
     # Now try without having a changeset

-    content "<osm><way id='#{current_ways(:visible_way).id}'></osm>"
+    content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"

     delete :delete, :id => current_ways(:visible_way).id
     assert_response :bad_request
     
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :bad_request
     


@@ -286,6 +297,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})"
     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 still used by relation 1.", @response.body

 
     # this won't work since the way never existed
     delete :delete, :id => 0
 
     # this won't work since the way never existed
     delete :delete, :id => 0


@@ -336,7 +348,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'"
     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
 
   ##
   end
 
   ##


@@ -383,7 +395,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'"
     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
 
     
   end
 


@@ -423,7 +435,7 @@ class WayControllerTest < ActionController::TestCase
     put :create
     assert_response :bad_request, 
     "adding new duplicate tags to a way should fail with 'bad request'"
     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
 
   ##
   end
 
   ##