X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e1f79d84adc413afa2a1a8d8d06fda9fa5151d49..34e3e51456774127d43408b7ab65c24f41373f62:/test/controllers/way_controller_test.rb

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index ca87e6543..58984923c 100644
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -65,11 +65,11 @@ class WayControllerTest < ActionController::TestCase
 
       # otherwise it should say success
       assert_response :success
-      
+
       # Check the way is correctly returned
       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 
+
+      # check that each node in the way appears once in the output as a
       # reference and as the node element.
       way.nodes.each do |n|
         count = (way.nodes - (way.nodes - [n])).length
@@ -118,14 +118,14 @@ class WayControllerTest < ActionController::TestCase
 
     # use the first user's open changeset
     changeset_id = changesets(:normal_user_first_change).id
-    
+
     # create a way with pre-existing nodes
     content "<osm><way changeset='#{changeset_id}'>" +
-      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" + 
+      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
       "<tag k='test' v='yes' /></way></osm>"
     put :create
     # hope for success
-    assert_response :forbidden, 
+    assert_response :forbidden,
         "way upload did not return success status"
     # read id of created way and search for it
     wayid = @response.body
@@ -137,32 +137,32 @@ class WayControllerTest < ActionController::TestCase
 
     # use the first user's open changeset
     changeset_id = changesets(:public_user_first_change).id
-    
+
     # create a way with pre-existing nodes
     content "<osm><way changeset='#{changeset_id}'>" +
-      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" + 
+      "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
       "<tag k='test' v='yes' /></way></osm>"
     put :create
     # hope for success
-    assert_response :success, 
+    assert_response :success,
         "way upload did not return success status"
     # read id of created way and search for it
     wayid = @response.body
     checkway = Way.find(wayid)
-    assert_not_nil checkway, 
+    assert_not_nil checkway,
         "uploaded way not found in data base after upload"
     # compare values
-    assert_equal checkway.nds.length, 2, 
+    assert_equal checkway.nds.length, 2,
         "saved way does not contain exactly one node"
-    assert_equal checkway.nds[0], nid1, 
+    assert_equal checkway.nds[0], nid1,
         "saved way does not contain the right node on pos 0"
-    assert_equal checkway.nds[1], nid2, 
+    assert_equal checkway.nds[1], nid2,
         "saved way does not contain the right node on pos 1"
     assert_equal checkway.changeset_id, changeset_id,
         "saved way does not belong to the correct changeset"
-    assert_equal users(:public_user).id, checkway.changeset.user_id, 
+    assert_equal users(:public_user).id, checkway.changeset.user_id,
         "saved way does not belong to user that created it"
-    assert_equal true, checkway.visible, 
+    assert_equal true, checkway.visible,
         "saved way is not visible"
   end
 
@@ -180,11 +180,11 @@ class WayControllerTest < ActionController::TestCase
     nid1 = current_nodes(:used_node_1).id
 
     # create a way with non-existing node
-    content "<osm><way changeset='#{open_changeset_id}'>" + 
+    content "<osm><way changeset='#{open_changeset_id}'>" +
       "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "way upload with invalid node using a private user did not return 'forbidden'"
 
     # create a way with no nodes
@@ -192,7 +192,7 @@ class WayControllerTest < ActionController::TestCase
       "<tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "way upload with no node using a private userdid not return 'forbidden'"
 
     # create a way inside a closed changeset
@@ -200,10 +200,10 @@ class WayControllerTest < ActionController::TestCase
       "<nd ref='#{nid1}'/></way></osm>"
     put :create
     # expect failure
-    assert_response :forbidden, 
-    "way upload to closed changeset with a private user did not return 'forbidden'"    
+    assert_response :forbidden,
+    "way upload to closed changeset with a private user did not return 'forbidden'"
+
 
-    
     ## Now test with a public user
     basic_authorization users(:public_user).email, "test"
 
@@ -213,11 +213,11 @@ class WayControllerTest < ActionController::TestCase
     nid1 = current_nodes(:used_node_1).id
 
     # create a way with non-existing node
-    content "<osm><way changeset='#{open_changeset_id}'>" + 
+    content "<osm><way changeset='#{open_changeset_id}'>" +
       "<nd ref='0'/><tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
-    assert_response :precondition_failed, 
+    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
 
@@ -226,7 +226,7 @@ class WayControllerTest < ActionController::TestCase
       "<tag k='test' v='yes' /></way></osm>"
     put :create
     # expect failure
-    assert_response :precondition_failed, 
+    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
 
@@ -235,8 +235,8 @@ class WayControllerTest < ActionController::TestCase
       "<nd ref='#{nid1}'/></way></osm>"
     put :create
     # expect failure
-    assert_response :conflict, 
-        "way upload to closed changeset did not return 'conflict'"    
+    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}'>" +
@@ -245,31 +245,31 @@ class WayControllerTest < ActionController::TestCase
       "</way></osm>"
     put :create
     # expect failure
-    assert_response :bad_request, 
+    assert_response :bad_request,
         "way upload to with too long tag did not return 'bad_request'"
   end
 
   # -------------------------------------
   # Test deleting ways.
   # -------------------------------------
-  
+
   def test_delete
     # first try to delete way without auth
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :unauthorized
 
     # now set auth using the private user
-    basic_authorization(users(:normal_user).email, "test");  
+    basic_authorization(users(:normal_user).email, "test");
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
-    
+
     # Now try without having a changeset
     content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :forbidden
-    
+
     # try to delete with an invalid (closed) changeset
     content update_changeset(current_ways(:visible_way).to_xml,
                              changesets(:normal_user_closed_change).id)
@@ -300,27 +300,27 @@ class WayControllerTest < ActionController::TestCase
     # this shouldn't work as the way is used in a relation
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "shouldn't be able to delete a way used in a relation (#{@response.body}), when done by a private user"
 
     # this won't work since the way never existed
     delete :delete, :id => 0
     assert_response :forbidden
 
-    
+
     ### Now check with a public user
     # now set auth
-    basic_authorization(users(:public_user).email, "test");  
+    basic_authorization(users(:public_user).email, "test");
 
     # this shouldn't work as with the 0.6 api we need pay load to delete
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :bad_request
-    
+
     # Now try without having a changeset
     content "<osm><way id='#{current_ways(:visible_way).id}'/></osm>"
     delete :delete, :id => current_ways(:visible_way).id
     assert_response :bad_request
-    
+
     # try to delete with an invalid (closed) changeset
     content update_changeset(current_ways(:visible_way).to_xml,
                              changesets(:public_user_closed_change).id)
@@ -351,7 +351,7 @@ class WayControllerTest < ActionController::TestCase
     # this shouldn't work as the way is used in a relation
     content current_ways(:used_way).to_xml
     delete :delete, :id => current_ways(:used_way).id
-    assert_response :precondition_failed, 
+    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
 
@@ -383,7 +383,7 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_xml
     put :update, :id => current_ways(:visible_way).id
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "adding a duplicate tag to a way for a non-public should fail with 'forbidden'"
 
     ## Now try with the public user
@@ -402,7 +402,7 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_xml
     put :update, :id => current_ways(:visible_way).id
-    assert_response :bad_request, 
+    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
   end
@@ -428,9 +428,9 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_xml
     put :update, :id => current_ways(:visible_way).id
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "adding new duplicate tags to a way using a non-public user should fail with 'forbidden'"
-    
+
     ## Now test with the public user
     # setup auth
     basic_authorization(users(:public_user).email, "test")
@@ -449,10 +449,10 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_xml
     put :update, :id => current_ways(:visible_way).id
-    assert_response :bad_request, 
+    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
-    
+
   end
 
   ##
@@ -473,9 +473,9 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_str
     put :create
-    assert_response :forbidden, 
+    assert_response :forbidden,
     "adding new duplicate tags to a way with a non-public user should fail with 'forbidden'"
-    
+
     ## Now do it with a public user
     # setup auth
     basic_authorization(users(:public_user).email, "test")
@@ -489,7 +489,7 @@ class WayControllerTest < ActionController::TestCase
     # try and upload it
     content way_str
     put :create
-    assert_response :bad_request, 
+    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
   end
@@ -498,7 +498,7 @@ class WayControllerTest < ActionController::TestCase
   # test that a call to ways_for_node returns all ways that contain the node
   # and none that don't.
   def test_ways_for_node
-    # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4 
+    # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4
     # *used* to use it but doesn't.
     get :ways_for_node, :id => current_nodes(:used_node_1).id
     assert_response :success
@@ -512,7 +512,7 @@ class WayControllerTest < ActionController::TestCase
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
     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
     expected_way_ids.each do |id|
       way_xml = ways_xml.find("//osm/way[@id='#{id}']").first