Remove diary_entry and diary_comment fixtures, and refactor tests.

[rails.git] / test / controllers / relation_controller_test.rb

diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index 10ee25c81e5f7aaa865319407c2f140c4d58dd3a..ab0aca45ed1233e97576b737427c0ad9eaa45f1d 100644 (file)
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'relation_controller'
+require "test_helper"
+require "relation_controller"

 
 class RelationControllerTest < ActionController::TestCase
   api_fixtures
 
 class RelationControllerTest < ActionController::TestCase
   api_fixtures


@@ -70,19 +70,19 @@ class RelationControllerTest < ActionController::TestCase
   def test_relations_for_node
     check_relations_for_element(:relations_for_node, "node",
                                 current_nodes(:node_used_by_relationship).id,
   def test_relations_for_node
     check_relations_for_element(:relations_for_node, "node",
                                 current_nodes(:node_used_by_relationship).id,

-                                [ :visible_relation, :used_relation ])
+                                [:visible_relation, :used_relation])

   end
 
   def test_relations_for_way
     check_relations_for_element(:relations_for_way, "way",
                                 current_ways(:used_way).id,
   end
 
   def test_relations_for_way
     check_relations_for_element(:relations_for_way, "way",
                                 current_ways(:used_way).id,

-                                [ :visible_relation ])
+                                [:visible_relation])

   end
 
   def test_relations_for_relation
     check_relations_for_element(:relations_for_relation, "relation",
                                 current_relations(:used_relation).id,
   end
 
   def test_relations_for_relation
     check_relations_for_element(:relations_for_relation, "relation",
                                 current_relations(:used_relation).id,

-                                [ :visible_relation ])
+                                [:visible_relation])

   end
 
   def check_relations_for_element(method, type, id, expected_relations)
   end
 
   def check_relations_for_element(method, type, id, expected_relations)


@@ -105,12 +105,15 @@ class RelationControllerTest < ActionController::TestCase
 
   def test_full
     # check the "full" mode
 
   def test_full
     # check the "full" mode

+    get :full, :id => 999999
+    assert_response :not_found
+
+    get :full, :id => current_relations(:invisible_relation).id
+    assert_response :gone
+

     get :full, :id => current_relations(:visible_relation).id
     assert_response :success
     get :full, :id => current_relations(:visible_relation).id
     assert_response :success

-    # FIXME check whether this contains the stuff we want!
-    if $VERBOSE
-        print @response.body
-    end
+    # FIXME: check whether this contains the stuff we want!

   end
 
   ##
   end
 
   ##


@@ -155,46 +158,43 @@ class RelationControllerTest < ActionController::TestCase
     put :create
     # hope for forbidden, due to user
     assert_response :forbidden,
     put :create
     # hope for forbidden, due to user
     assert_response :forbidden,

-    "relation upload should have failed with forbidden"
+                    "relation upload should have failed with forbidden"

 
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +
 
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member  ref='#{nid}' type='node' role='some'/>" +
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member  ref='#{nid}' type='node' role='some'/>" +
+            "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for forbidden due to user
     assert_response :forbidden,
     put :create
     # hope for forbidden due to user
     assert_response :forbidden,

-    "relation upload did not return forbidden status"
+                    "relation upload did not return forbidden status"

 
     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +
 
     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member  ref='#{nid}' type='node'/>"+
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member  ref='#{nid}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for forbidden due to user
     assert_response :forbidden,
     put :create
     # hope for forbidden due to user
     assert_response :forbidden,

-    "relation upload did not return forbidden status"
+                    "relation upload did not return forbidden status"

 
     ###
     # create an relation with a way and a node as members
     nid = current_nodes(:used_node_1).id
     wid = current_ways(:used_way).id
     content "<osm><relation changeset='#{changeset_id}'>" +
 
     ###
     # create an relation with a way and a node as members
     nid = current_nodes(:used_node_1).id
     wid = current_ways(:used_way).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member type='node' ref='#{nid}' role='some'/>" +
-      "<member type='way' ref='#{wid}' role='other'/>" +
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member type='node' ref='#{nid}' role='some'/>" +
+            "<member type='way' ref='#{wid}' role='other'/>" +
+            "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for forbidden, due to user
     assert_response :forbidden,
     put :create
     # hope for forbidden, due to user
     assert_response :forbidden,

-        "relation upload did not return success status"
-
-
+                    "relation upload did not return success status"

 
     ## Now try with the public user
     basic_authorization users(:public_user).email, "test"
 
     ## Now try with the public user
     basic_authorization users(:public_user).email, "test"


@@ -207,88 +207,85 @@ class RelationControllerTest < ActionController::TestCase
     put :create
     # hope for success
     assert_response :success,
     put :create
     # hope for success
     assert_response :success,

-        "relation upload did not return success status"
+                    "relation upload did not return success status"

     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,
     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,

-        "uploaded relation not found in data base after upload"
+                   "uploaded relation not found in data base after upload"

     # compare values
     assert_equal checkrelation.members.length, 0,
     # compare values
     assert_equal checkrelation.members.length, 0,

-        "saved relation contains members but should not"
+                 "saved relation contains members but should not"

     assert_equal checkrelation.tags.length, 1,
     assert_equal checkrelation.tags.length, 1,

-        "saved relation does not contain exactly one tag"
+                 "saved relation does not contain exactly one tag"

     assert_equal changeset_id, checkrelation.changeset.id,
     assert_equal changeset_id, checkrelation.changeset.id,

-        "saved relation does not belong in the changeset it was assigned to"
+                 "saved relation does not belong in the changeset it was assigned to"

     assert_equal users(:public_user).id, checkrelation.changeset.user_id,
     assert_equal users(:public_user).id, checkrelation.changeset.user_id,

-        "saved relation does not belong to user that created it"
+                 "saved relation does not belong to user that created it"

     assert_equal true, checkrelation.visible,
     assert_equal true, checkrelation.visible,

-        "saved relation is not visible"
+                 "saved relation is not visible"

     # ok the relation is there but can we also retrieve it?
     get :read, :id => relationid
     assert_response :success
 
     # ok the relation is there but can we also retrieve it?
     get :read, :id => relationid
     assert_response :success
 

-

     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member  ref='#{nid}' type='node' role='some'/>" +
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member  ref='#{nid}' type='node' role='some'/>" +
+            "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for success
     assert_response :success,
     put :create
     # hope for success
     assert_response :success,

-        "relation upload did not return success status"
+                    "relation upload did not return success status"

     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,
     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,

-        "uploaded relation not found in data base after upload"
+                   "uploaded relation not found in data base after upload"

     # compare values
     assert_equal checkrelation.members.length, 1,
     # compare values
     assert_equal checkrelation.members.length, 1,

-        "saved relation does not contain exactly one member"
+                 "saved relation does not contain exactly one member"

     assert_equal checkrelation.tags.length, 1,
     assert_equal checkrelation.tags.length, 1,

-        "saved relation does not contain exactly one tag"
+                 "saved relation does not contain exactly one tag"

     assert_equal changeset_id, checkrelation.changeset.id,
     assert_equal changeset_id, checkrelation.changeset.id,

-        "saved relation does not belong in the changeset it was assigned to"
+                 "saved relation does not belong in the changeset it was assigned to"

     assert_equal users(:public_user).id, checkrelation.changeset.user_id,
     assert_equal users(:public_user).id, checkrelation.changeset.user_id,

-        "saved relation does not belong to user that created it"
+                 "saved relation does not belong to user that created it"

     assert_equal true, checkrelation.visible,
     assert_equal true, checkrelation.visible,

-        "saved relation is not visible"
+                 "saved relation is not visible"

     # ok the relation is there but can we also retrieve it?
 
     get :read, :id => relationid
     assert_response :success
 
     # ok the relation is there but can we also retrieve it?
 
     get :read, :id => relationid
     assert_response :success
 

-

     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +
     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included
     nid = current_nodes(:used_node_1).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member  ref='#{nid}' type='node'/>"+
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member  ref='#{nid}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for success
     assert_response :success,
     put :create
     # hope for success
     assert_response :success,

-        "relation upload did not return success status"
+                    "relation upload did not return success status"

     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,
     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,

-        "uploaded relation not found in data base after upload"
+                   "uploaded relation not found in data base after upload"

     # compare values
     assert_equal checkrelation.members.length, 1,
     # compare values
     assert_equal checkrelation.members.length, 1,

-        "saved relation does not contain exactly one member"
+                 "saved relation does not contain exactly one member"

     assert_equal checkrelation.tags.length, 1,
     assert_equal checkrelation.tags.length, 1,

-        "saved relation does not contain exactly one tag"
+                 "saved relation does not contain exactly one tag"

     assert_equal changeset_id, checkrelation.changeset.id,
     assert_equal changeset_id, checkrelation.changeset.id,

-        "saved relation does not belong in the changeset it was assigned to"
+                 "saved relation does not belong in the changeset it was assigned to"

     assert_equal users(:public_user).id, checkrelation.changeset.user_id,
     assert_equal users(:public_user).id, checkrelation.changeset.user_id,

-        "saved relation does not belong to user that created it"
+                 "saved relation does not belong to user that created it"

     assert_equal true, checkrelation.visible,
     assert_equal true, checkrelation.visible,

-        "saved relation is not visible"
+                 "saved relation is not visible"

     # ok the relation is there but can we also retrieve it?
 
     get :read, :id => relationid
     # ok the relation is there but can we also retrieve it?
 
     get :read, :id => relationid


@@ -299,33 +296,32 @@ class RelationControllerTest < ActionController::TestCase
     nid = current_nodes(:used_node_1).id
     wid = current_ways(:used_way).id
     content "<osm><relation changeset='#{changeset_id}'>" +
     nid = current_nodes(:used_node_1).id
     wid = current_ways(:used_way).id
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member type='node' ref='#{nid}' role='some'/>" +
-      "<member type='way' ref='#{wid}' role='other'/>" +
-      "<tag k='test' v='yes' /></relation></osm>"
+            "<member type='node' ref='#{nid}' role='some'/>" +
+            "<member type='way' ref='#{wid}' role='other'/>" +
+            "<tag k='test' v='yes' /></relation></osm>"

     put :create
     # hope for success
     assert_response :success,
     put :create
     # hope for success
     assert_response :success,

-        "relation upload did not return success status"
+                    "relation upload did not return success status"

     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,
     # read id of created relation and search for it
     relationid = @response.body
     checkrelation = Relation.find(relationid)
     assert_not_nil checkrelation,

-        "uploaded relation not found in data base after upload"
+                   "uploaded relation not found in data base after upload"

     # compare values
     assert_equal checkrelation.members.length, 2,
     # compare values
     assert_equal checkrelation.members.length, 2,

-        "saved relation does not have exactly two members"
+                 "saved relation does not have exactly two members"

     assert_equal checkrelation.tags.length, 1,
     assert_equal checkrelation.tags.length, 1,

-        "saved relation does not contain exactly one tag"
+                 "saved relation does not contain exactly one tag"

     assert_equal changeset_id, checkrelation.changeset.id,
     assert_equal changeset_id, checkrelation.changeset.id,

-        "saved relation does not belong in the changeset it was assigned to"
+                 "saved relation does not belong in the changeset it was assigned to"

     assert_equal users(:public_user).id, checkrelation.changeset.user_id,
     assert_equal users(:public_user).id, checkrelation.changeset.user_id,

-        "saved relation does not belong to user that created it"
+                 "saved relation does not belong to user that created it"

     assert_equal true, checkrelation.visible,
     assert_equal true, checkrelation.visible,

-        "saved relation is not visible"
+                 "saved relation is not visible"

     # ok the relation is there but can we also retrieve it?
     get :read, :id => relationid
     assert_response :success
     # ok the relation is there but can we also retrieve it?
     get :read, :id => relationid
     assert_response :success

-

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


@@ -346,7 +342,7 @@ class RelationControllerTest < ActionController::TestCase
     with_relation(rel_id) do |rel|
       # alter one of the tags
       tag = rel.find("//osm/relation/tag").first
     with_relation(rel_id) do |rel|
       # alter one of the tags
       tag = rel.find("//osm/relation/tag").first

-      tag['v'] = 'some changed value'
+      tag["v"] = "some changed value"

       update_changeset(rel, cs_id)
 
       # check that the downloaded tags are the same as the uploaded tags...
       update_changeset(rel, cs_id)
 
       # check that the downloaded tags are the same as the uploaded tags...


@@ -375,7 +371,7 @@ class RelationControllerTest < ActionController::TestCase
     with_relation(rel_id) do |rel|
       # alter one of the tags
       tag = rel.find("//osm/relation/tag").first
     with_relation(rel_id) do |rel|
       # alter one of the tags
       tag = rel.find("//osm/relation/tag").first

-      tag['v'] = 'some changed value'
+      tag["v"] = "some changed value"

       update_changeset(rel, cs_id)
 
       # check that the downloaded tags are the same as the uploaded tags...
       update_changeset(rel, cs_id)
 
       # check that the downloaded tags are the same as the uploaded tags...


@@ -391,6 +387,19 @@ class RelationControllerTest < ActionController::TestCase
     end
   end
 
     end
   end
 

+  def test_update_wrong_id
+    basic_authorization users(:public_user).email, "test"
+    rel_id = current_relations(:multi_tag_relation).id
+    cs_id = changesets(:public_user_first_change).id
+
+    with_relation(rel_id) do |rel|
+      update_changeset(rel, cs_id)
+      content rel
+      put :update, :id => current_relations(:visible_relation).id
+      assert_response :bad_request
+    end
+  end
+

   # -------------------------------------
   # Test creating some invalid relations.
   # -------------------------------------
   # -------------------------------------
   # Test creating some invalid relations.
   # -------------------------------------


@@ -403,12 +412,12 @@ class RelationControllerTest < ActionController::TestCase
 
     # create a relation with non-existing node as member
     content "<osm><relation changeset='#{changeset_id}'>" +
 
     # create a relation with non-existing node as member
     content "<osm><relation changeset='#{changeset_id}'>" +

-      "<member type='node' ref='0'/><tag k='test' v='yes' />" +
-      "</relation></osm>"
+            "<member type='node' ref='0'/><tag k='test' v='yes' />" +
+            "</relation></osm>"

     put :create
     # expect failure
     assert_response :precondition_failed,
     put :create
     # expect failure
     assert_response :precondition_failed,

-        "relation upload with invalid node did not return 'precondition failed'"
+                    "relation upload with invalid node did not return 'precondition failed'"

     assert_equal "Precondition failed: Relation with id  cannot be saved due to Node with id 0", @response.body
   end
 
     assert_equal "Precondition failed: Relation with id  cannot be saved due to Node with id 0", @response.body
   end
 


@@ -423,8 +432,8 @@ class RelationControllerTest < ActionController::TestCase
 
     # create some xml that should return an error
     content "<osm><relation changeset='#{changeset_id}'>" +
 
     # create some xml that should return an error
     content "<osm><relation changeset='#{changeset_id}'>" +

-    "<member type='type' ref='#{current_nodes(:used_node_1).id}' role=''/>" +
-    "<tag k='tester' v='yep'/></relation></osm>"
+            "<member type='type' ref='#{current_nodes(:used_node_1).id}' role=''/>" +
+            "<tag k='tester' v='yep'/></relation></osm>"

     put :create
     # expect failure
     assert_response :bad_request
     put :create
     # expect failure
     assert_response :bad_request


@@ -432,7 +441,6 @@ class RelationControllerTest < ActionController::TestCase
     assert_match(/The type is not allowed only, /, @response.body)
   end
 
     assert_match(/The type is not allowed only, /, @response.body)
   end
 

-

   # -------------------------------------
   # Test deleting relations.
   # -------------------------------------
   # -------------------------------------
   # Test deleting relations.
   # -------------------------------------


@@ -442,7 +450,6 @@ class RelationControllerTest < ActionController::TestCase
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :unauthorized
 
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :unauthorized
 

-

     ## Then try with the private user, to make sure that you get a forbidden
     basic_authorization(users(:normal_user).email, "test")
 
     ## Then try with the private user, to make sure that you get a forbidden
     basic_authorization(users(:normal_user).email, "test")
 


@@ -462,7 +469,7 @@ class RelationControllerTest < ActionController::TestCase
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset

-    content update_changeset(current_relations(:visible_relation).to_xml,0)
+    content update_changeset(current_relations(:visible_relation).to_xml, 0)

     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :forbidden
 
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :forbidden
 


@@ -491,10 +498,8 @@ class RelationControllerTest < ActionController::TestCase
     delete :delete, :id => 0
     assert_response :forbidden
 
     delete :delete, :id => 0
     assert_response :forbidden
 

-
-

     ## now set auth for the public user
     ## now set auth for the public user

-    basic_authorization(users(:public_user).email, "test");
+    basic_authorization(users(:public_user).email, "test")

 
     # this shouldn't work, as we should need the payload...
     delete :delete, :id => current_relations(:visible_relation).id
 
     # this shouldn't work, as we should need the payload...
     delete :delete, :id => current_relations(:visible_relation).id


@@ -513,7 +518,7 @@ class RelationControllerTest < ActionController::TestCase
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset

-    content update_changeset(current_relations(:visible_relation).to_xml,0)
+    content update_changeset(current_relations(:visible_relation).to_xml, 0)

     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :conflict
 
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :conflict
 


@@ -521,7 +526,7 @@ class RelationControllerTest < ActionController::TestCase
     content(relations(:used_relation).to_xml)
     delete :delete, :id => current_relations(:used_relation).id
     assert_response :conflict,
     content(relations(:used_relation).to_xml)
     delete :delete, :id => current_relations(:used_relation).id
     assert_response :conflict,

-    "shouldn't be able to delete a relation in a changeset owned by someone else (#{@response.body})"
+                    "shouldn't be able to delete a relation in a changeset owned by someone else (#{@response.body})"

 
     # this won't work because the relation in the payload is different to that passed
     content(relations(:public_used_relation).to_xml)
 
     # this won't work because the relation in the payload is different to that passed
     content(relations(:public_used_relation).to_xml)


@@ -533,7 +538,7 @@ class RelationControllerTest < ActionController::TestCase
     content(relations(:public_used_relation).to_xml)
     delete :delete, :id => current_relations(:public_used_relation).id
     assert_response :precondition_failed,
     content(relations(:public_used_relation).to_xml)
     delete :delete, :id => current_relations(:public_used_relation).id
     assert_response :precondition_failed,

-       "shouldn't be able to delete a relation used in a relation (#{@response.body})"
+                    "shouldn't be able to delete a relation used in a relation (#{@response.body})"

     assert_equal "Precondition failed: The relation 5 is used in relation 6.", @response.body
 
     # this should work when we provide the appropriate payload...
     assert_equal "Precondition failed: The relation 5 is used in relation 6.", @response.body
 
     # this should work when we provide the appropriate payload...


@@ -544,7 +549,7 @@ class RelationControllerTest < ActionController::TestCase
     # valid delete should return the new version number, which should
     # be greater than the old version number
     assert @response.body.to_i > current_relations(:visible_relation).version,
     # valid delete should return the new version number, which should
     # be greater than the old version number
     assert @response.body.to_i > current_relations(:visible_relation).version,

-       "delete request should return a new version number for relation"
+           "delete request should return a new version number for relation"

 
     # this won't work since the relation is already deleted
     content(relations(:invisible_relation).to_xml)
 
     # this won't work since the relation is already deleted
     content(relations(:invisible_relation).to_xml)


@@ -561,7 +566,7 @@ class RelationControllerTest < ActionController::TestCase
     content(relations(:public_used_relation).to_xml)
     delete :delete, :id => current_relations(:public_used_relation).id
     assert_response :success,
     content(relations(:public_used_relation).to_xml)
     delete :delete, :id => current_relations(:public_used_relation).id
     assert_response :success,

-       "should be able to delete a relation used in an old relation (#{@response.body})"
+                    "should be able to delete a relation used in an old relation (#{@response.body})"

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


@@ -574,13 +579,13 @@ class RelationControllerTest < ActionController::TestCase
   def test_tag_modify_bounding_box
     # in current fixtures, relation 5 contains nodes 3 and 5 (node 3
     # indirectly via way 3), so the bbox should be [3,3,5,5].
   def test_tag_modify_bounding_box
     # in current fixtures, relation 5 contains nodes 3 and 5 (node 3
     # indirectly via way 3), so the bbox should be [3,3,5,5].

-    check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id|
+    check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|

       # add a tag to an existing relation
       relation_xml = current_relations(:visible_relation).to_xml
       relation_element = relation_xml.find("//osm/relation").first
       new_tag = XML::Node.new("tag")
       # add a tag to an existing relation
       relation_xml = current_relations(:visible_relation).to_xml
       relation_element = relation_xml.find("//osm/relation").first
       new_tag = XML::Node.new("tag")

-      new_tag['k'] = "some_new_tag"
-      new_tag['v'] = "some_new_value"
+      new_tag["k"] = "some_new_tag"
+      new_tag["v"] = "some_new_value"

       relation_element << new_tag
 
       # update changeset ID to point to new changeset
       relation_element << new_tag
 
       # update changeset ID to point to new changeset


@@ -602,16 +607,15 @@ class RelationControllerTest < ActionController::TestCase
     [current_nodes(:used_node_1),
      current_nodes(:used_node_2),
      current_ways(:used_way),
     [current_nodes(:used_node_1),
      current_nodes(:used_node_2),
      current_ways(:used_way),

-     current_ways(:way_with_versions)
-    ].each_with_index do |element, version|
+     current_ways(:way_with_versions)].each_with_index do |element, _version|

       bbox = element.bbox.to_unscaled
       check_changeset_modify(bbox) do |changeset_id|
         relation_xml = Relation.find(relation_id).to_xml
         relation_element = relation_xml.find("//osm/relation").first
         new_member = XML::Node.new("member")
       bbox = element.bbox.to_unscaled
       check_changeset_modify(bbox) do |changeset_id|
         relation_xml = Relation.find(relation_id).to_xml
         relation_element = relation_xml.find("//osm/relation").first
         new_member = XML::Node.new("member")

-        new_member['ref'] = element.id.to_s
-        new_member['type'] = element.class.to_s.downcase
-        new_member['role'] = "some_role"
+        new_member["ref"] = element.id.to_s
+        new_member["type"] = element.class.to_s.downcase
+        new_member["role"] = "some_role"

         relation_element << new_member
 
         # update changeset ID to point to new changeset
         relation_element << new_member
 
         # update changeset ID to point to new changeset


@@ -634,12 +638,12 @@ class RelationControllerTest < ActionController::TestCase
   # remove a member from a relation and check the bounding box is
   # only that element.
   def test_remove_member_bounding_box
   # remove a member from a relation and check the bounding box is
   # only that element.
   def test_remove_member_bounding_box

-    check_changeset_modify(BoundingBox.new(5,5,5,5)) do |changeset_id|
+    check_changeset_modify(BoundingBox.new(5, 5, 5, 5)) do |changeset_id|

       # remove node 5 (5,5) from an existing relation
       relation_xml = current_relations(:visible_relation).to_xml
       # remove node 5 (5,5) from an existing relation
       relation_xml = current_relations(:visible_relation).to_xml

-      relation_xml.
-        find("//osm/relation/member[@type='node'][@ref='5']").
-        first.remove!
+      relation_xml
+        .find("//osm/relation/member[@type='node'][@ref='5']")
+        .first.remove!

 
       # update changeset ID to point to new changeset
       update_changeset(relation_xml, changeset_id)
 
       # update changeset ID to point to new changeset
       update_changeset(relation_xml, changeset_id)


@@ -680,19 +684,19 @@ OSM
 
     # insert a member at the front
     new_member = XML::Node.new "member"
 
     # insert a member at the front
     new_member = XML::Node.new "member"

-    new_member['ref'] = 5.to_s
-    new_member['type'] = 'node'
-    new_member['role'] = 'new first'
+    new_member["ref"] = 5.to_s
+    new_member["type"] = "node"
+    new_member["role"] = "new first"

     doc.find("//osm/relation").first.child.prev = new_member
     # update the version, should be 1?
     doc.find("//osm/relation").first.child.prev = new_member
     # update the version, should be 1?

-    doc.find("//osm/relation").first['id'] = relation_id.to_s
-    doc.find("//osm/relation").first['version'] = 1.to_s
+    doc.find("//osm/relation").first["id"] = relation_id.to_s
+    doc.find("//osm/relation").first["version"] = 1.to_s

 
     # upload the next version of the relation
     content doc
     put :update, :id => relation_id
     assert_response :success, "can't update relation: #{@response.body}"
 
     # upload the next version of the relation
     content doc
     put :update, :id => relation_id
     assert_response :success, "can't update relation: #{@response.body}"

-    new_version = @response.body.to_i
+    assert_equal 2, @response.body.to_i

 
     # get it back again and check the ordering again
     get :read, :id => relation_id
 
     # get it back again and check the ordering again
     get :read, :id => relation_id


@@ -723,14 +727,14 @@ OSM
     doc = XML::Parser.string(doc_str).parse
 
     ## First try with the private user
     doc = XML::Parser.string(doc_str).parse
 
     ## First try with the private user

-    basic_authorization(users(:normal_user).email, "test");
+    basic_authorization(users(:normal_user).email, "test")

 
     content doc
     put :create
     assert_response :forbidden
 
     ## Now try with the public user
 
     content doc
     put :create
     assert_response :forbidden
 
     ## Now try with the public user

-    basic_authorization(users(:public_user).email, "test");
+    basic_authorization(users(:public_user).email, "test")

 
     content doc
     put :create
 
     content doc
     put :create


@@ -757,7 +761,7 @@ OSM
 </osm>
 OSM
     doc = XML::Parser.string(doc_str).parse
 </osm>
 OSM
     doc = XML::Parser.string(doc_str).parse

-    basic_authorization(users(:public_user).email, "test");
+    basic_authorization(users(:public_user).email, "test")

 
     content doc
     put :create
 
     content doc
     put :create


@@ -781,11 +785,11 @@ OSM
   # remove all the members from a relation. the result is pretty useless, but
   # still technically valid.
   def test_remove_all_members
   # remove all the members from a relation. the result is pretty useless, but
   # still technically valid.
   def test_remove_all_members

-    check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id|
+    check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|

       relation_xml = current_relations(:visible_relation).to_xml
       relation_xml = current_relations(:visible_relation).to_xml

-      relation_xml.
-        find("//osm/relation/member").
-        each {|m| m.remove!}
+      relation_xml
+        .find("//osm/relation/member")
+        .each(&:remove!)

 
       # update changeset ID to point to new changeset
       update_changeset(relation_xml, changeset_id)
 
       # update changeset ID to point to new changeset
       update_changeset(relation_xml, changeset_id)


@@ -813,11 +817,11 @@ OSM
     new_doc = XML::Parser.string(xml).parse
 
     doc_members = doc.find("//osm/relation/member").collect do |m|
     new_doc = XML::Parser.string(xml).parse
 
     doc_members = doc.find("//osm/relation/member").collect do |m|

-      [m['ref'].to_i, m['type'].to_sym, m['role']]
+      [m["ref"].to_i, m["type"].to_sym, m["role"]]

     end
 
     new_members = new_doc.find("//osm/relation/member").collect do |m|
     end
 
     new_members = new_doc.find("//osm/relation/member").collect do |m|

-      [m['ref'].to_i, m['type'].to_sym, m['role']]
+      [m["ref"].to_i, m["type"].to_sym, m["role"]]

     end
 
     doc_members.zip(new_members).each do |d, n|
     end
 
     doc_members.zip(new_members).each do |d, n|


@@ -830,7 +834,7 @@ OSM
   # that the changeset bounding box is +bbox+.
   def check_changeset_modify(bbox)
     ## First test with the private user to check that you get a forbidden
   # that the changeset bounding box is +bbox+.
   def check_changeset_modify(bbox)
     ## First test with the private user to check that you get a forbidden

-    basic_authorization(users(:normal_user).email, "test");
+    basic_authorization(users(:normal_user).email, "test")

 
     # create a new changeset for this operation, so we are assured
     # that the bounding box will be newly-generated.
 
     # create a new changeset for this operation, so we are assured
     # that the bounding box will be newly-generated.


@@ -840,7 +844,6 @@ OSM
       assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden"
     end
 
       assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden"
     end
 

-

     ## Now do the whole thing with the public user
     basic_authorization(users(:public_user).email, "test")
 
     ## Now do the whole thing with the public user
     basic_authorization(users(:public_user).email, "test")
 


@@ -903,7 +906,7 @@ OSM
 
     yield new_rel
 
 
     yield new_rel
 

-    return version
+    version

   end
 
   ##
   end
 
   ##


@@ -912,14 +915,14 @@ OSM
   # the parsed XML doc is retured.
   def with_update_diff(rel)
     rel_id = rel.find("//osm/relation").first["id"].to_i
   # the parsed XML doc is retured.
   def with_update_diff(rel)
     rel_id = rel.find("//osm/relation").first["id"].to_i

-    cs_id = rel.find("//osm/relation").first['changeset'].to_i
+    cs_id = rel.find("//osm/relation").first["changeset"].to_i

     version = nil
 
     with_controller(ChangesetController.new) do
       doc = OSM::API.new.get_xml_doc
     version = nil
 
     with_controller(ChangesetController.new) do
       doc = OSM::API.new.get_xml_doc

-      change = XML::Node.new 'osmChange'
+      change = XML::Node.new "osmChange"

       doc.root = change
       doc.root = change

-      modify = XML::Node.new 'modify'
+      modify = XML::Node.new "modify"

       change << modify
       modify << doc.import(rel.find("//osm/relation").first)
 
       change << modify
       modify << doc.import(rel.find("//osm/relation").first)
 


@@ -936,15 +939,14 @@ OSM
 
     yield new_rel
 
 
     yield new_rel
 

-    return version
+    version

   end
 
   ##
   # returns a k->v hash of tags from an xml doc
   def get_tags_as_hash(a)
   end
 
   ##
   # returns a k->v hash of tags from an xml doc
   def get_tags_as_hash(a)

-    a.find("//osm/relation/tag").sort_by { |v| v['k'] }.inject({}) do |h,v|
-      h[v['k']] = v['v']
-      h
+    a.find("//osm/relation/tag").sort_by { |v| v["k"] }.each_with_object({}) do |v, h|
+      h[v["k"]] = v["v"]

     end
   end
 
     end
   end
 


@@ -959,22 +961,22 @@ OSM
     assert_equal a_tags.keys, b_tags.keys, "Tag keys should be identical."
     a_tags.each do |k, v|
       assert_equal v, b_tags[k],
     assert_equal a_tags.keys, b_tags.keys, "Tag keys should be identical."
     a_tags.each do |k, v|
       assert_equal v, b_tags[k],

-        "Tags which were not altered should be the same. " +
-        "#{a_tags.inspect} != #{b_tags.inspect}"
+                   "Tags which were not altered should be the same. " +
+                   "#{a_tags.inspect} != #{b_tags.inspect}"

     end
   end
 
   ##
   # update the changeset_id of a node element
   def update_changeset(xml, changeset_id)
     end
   end
 
   ##
   # update the changeset_id of a node element
   def update_changeset(xml, changeset_id)

-    xml_attr_rewrite(xml, 'changeset', changeset_id)
+    xml_attr_rewrite(xml, "changeset", changeset_id)

   end
 
   ##
   # update an attribute in the node element
   def xml_attr_rewrite(xml, name, value)
     xml.find("//osm/relation").first[name] = value.to_s
   end
 
   ##
   # update an attribute in the node element
   def xml_attr_rewrite(xml, name, value)
     xml.find("//osm/relation").first[name] = value.to_s

-    return xml
+    xml

   end
 
   ##
   end
 
   ##