Using javascript and data attribute instead of inline css

[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 5ecd18fc7219edf0077694d77ac47892d6cda314..8a7e8b2fe2b6bcf212c804e19ace3df7475e8efd 100644 (file)
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "relation_controller"
 
 class RelationControllerTest < ActionController::TestCase
 require "relation_controller"
 
 class RelationControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -52,15 +50,15 @@ class RelationControllerTest < ActionController::TestCase
 
   def test_read
     # check that a visible relation is returned properly
 
   def test_read
     # check that a visible relation is returned properly

-    get :read, :id => current_relations(:visible_relation).id
+    get :read, :params => { :id => create(:relation).id }

     assert_response :success
 
     # check that an invisible relation is not returned
     assert_response :success
 
     # check that an invisible relation is not returned

-    get :read, :id => current_relations(:invisible_relation).id
+    get :read, :params => { :id => create(:relation, :deleted).id }

     assert_response :gone
 
     # check chat a non-existent relation is not returned
     assert_response :gone
 
     # check chat a non-existent relation is not returned

-    get :read, :id => 0
+    get :read, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -131,7 +129,7 @@ class RelationControllerTest < ActionController::TestCase
 
   def check_relations_for_element(method, type, id, expected_relations)
     # check the "relations for relation" mode
 
   def check_relations_for_element(method, type, id, expected_relations)
     # check the "relations for relation" mode

-    get method, :id => id
+    get method, :params => { :id => id }

     assert_response :success
 
     # count one osm element
     assert_response :success
 
     # count one osm element


@@ -150,13 +148,13 @@ class RelationControllerTest < ActionController::TestCase
 
   def test_full
     # check the "full" mode
 
   def test_full
     # check the "full" mode

-    get :full, :id => 999999
+    get :full, :params => { :id => 999999 }

     assert_response :not_found
 
     assert_response :not_found
 

-    get :full, :id => current_relations(:invisible_relation).id
+    get :full, :params => { :id => create(:relation, :deleted).id }

     assert_response :gone
 
     assert_response :gone
 

-    get :full, :id => current_relations(:visible_relation).id
+    get :full, :params => { :id => create(:relation).id }

     assert_response :success
     # FIXME: check whether this contains the stuff we want!
   end
     assert_response :success
     # FIXME: check whether this contains the stuff we want!
   end


@@ -164,27 +162,33 @@ class RelationControllerTest < ActionController::TestCase
   ##
   # test fetching multiple relations
   def test_relations
   ##
   # test fetching multiple relations
   def test_relations

+    relation1 = create(:relation)
+    relation2 = create(:relation, :deleted)
+    relation3 = create(:relation, :with_history, :version => 2)
+    relation4 = create(:relation, :with_history, :version => 2)
+    relation4.old_relations.find_by(:version => 1).redact!(create(:redaction))
+

     # check error when no parameter provided
     get :relations
     assert_response :bad_request
 
     # check error when no parameter value provided
     # check error when no parameter provided
     get :relations
     assert_response :bad_request
 
     # check error when no parameter value provided

-    get :relations, :relations => ""
+    get :relations, :params => { :relations => "" }

     assert_response :bad_request
 
     # test a working call
     assert_response :bad_request
 
     # test a working call

-    get :relations, :relations => "1,2,4,7"
+    get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id}" }

     assert_response :success
     assert_select "osm" do
       assert_select "relation", :count => 4
     assert_response :success
     assert_select "osm" do
       assert_select "relation", :count => 4

-      assert_select "relation[id='1'][visible='true']", :count => 1
-      assert_select "relation[id='2'][visible='false']", :count => 1
-      assert_select "relation[id='4'][visible='true']", :count => 1
-      assert_select "relation[id='7'][visible='true']", :count => 1
+      assert_select "relation[id='#{relation1.id}'][visible='true']", :count => 1
+      assert_select "relation[id='#{relation2.id}'][visible='false']", :count => 1
+      assert_select "relation[id='#{relation3.id}'][visible='true']", :count => 1
+      assert_select "relation[id='#{relation4.id}'][visible='true']", :count => 1

     end
 
     # check error when a non-existent relation is included
     end
 
     # check error when a non-existent relation is included

-    get :relations, :relations => "1,2,4,7,400"
+    get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},0" }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -212,8 +216,8 @@ class RelationControllerTest < ActionController::TestCase
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation

-    content "<osm><relation changeset='#{private_changeset.id}'>" +
-            "<member  ref='#{node.id}' type='node' role='some'/>" +
+    content "<osm><relation changeset='#{private_changeset.id}'>" \
+            "<member  ref='#{node.id}' type='node' role='some'/>" \

             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden due to user
             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden due to user


@@ -223,7 +227,7 @@ class RelationControllerTest < ActionController::TestCase
     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included
     ###
     # create an relation with a node as member, this time test that we don't
     # need a role attribute to be included

-    content "<osm><relation changeset='#{private_changeset.id}'>" +
+    content "<osm><relation changeset='#{private_changeset.id}'>" \

             "<member  ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden due to user
             "<member  ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden due to user


@@ -232,9 +236,9 @@ class RelationControllerTest < ActionController::TestCase
 
     ###
     # create an relation with a way and a node as members
 
     ###
     # create an relation with a way and a node as members

-    content "<osm><relation changeset='#{private_changeset.id}'>" +
-            "<member type='node' ref='#{node.id}' role='some'/>" +
-            "<member type='way' ref='#{way.id}' role='other'/>" +
+    content "<osm><relation changeset='#{private_changeset.id}'>" \
+            "<member type='node' ref='#{node.id}' role='some'/>" \
+            "<member type='way' ref='#{way.id}' role='other'/>" \

             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden, due to user
             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for forbidden, due to user


@@ -267,14 +271,14 @@ class RelationControllerTest < ActionController::TestCase
     assert_equal true, checkrelation.visible,
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
     assert_equal true, checkrelation.visible,
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?

-    get :read, :id => relationid
+    get :read, :params => { :id => relationid }

     assert_response :success
 
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation
     assert_response :success
 
     ###
     # create an relation with a node as member
     # This time try with a role attribute in the relation

-    content "<osm><relation changeset='#{changeset.id}'>" +
-            "<member  ref='#{node.id}' type='node' role='some'/>" +
+    content "<osm><relation changeset='#{changeset.id}'>" \
+            "<member  ref='#{node.id}' type='node' role='some'/>" \

             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success
             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success


@@ -298,13 +302,13 @@ class RelationControllerTest < ActionController::TestCase
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
 
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
 

-    get :read, :id => relationid
+    get :read, :params => { :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
     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

-    content "<osm><relation changeset='#{changeset.id}'>" +
+    content "<osm><relation changeset='#{changeset.id}'>" \

             "<member  ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success
             "<member  ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success


@@ -328,14 +332,14 @@ class RelationControllerTest < ActionController::TestCase
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
 
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
 

-    get :read, :id => relationid
+    get :read, :params => { :id => relationid }

     assert_response :success
 
     ###
     # create an relation with a way and a node as members
     assert_response :success
 
     ###
     # create an relation with a way and a node as members

-    content "<osm><relation changeset='#{changeset.id}'>" +
-            "<member type='node' ref='#{node.id}' role='some'/>" +
-            "<member type='way' ref='#{way.id}' role='other'/>" +
+    content "<osm><relation changeset='#{changeset.id}'>" \
+            "<member type='node' ref='#{node.id}' role='some'/>" \
+            "<member type='way' ref='#{way.id}' role='other'/>" \

             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success
             "<tag k='test' v='yes' /></relation></osm>"
     put :create
     # hope for success


@@ -358,7 +362,7 @@ class RelationControllerTest < ActionController::TestCase
     assert_equal true, checkrelation.visible,
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?
     assert_equal true, checkrelation.visible,
                  "saved relation is not visible"
     # ok the relation is there but can we also retrieve it?

-    get :read, :id => relationid
+    get :read, :params => { :id => relationid }

     assert_response :success
   end
 
     assert_response :success
   end
 


@@ -441,7 +445,7 @@ class RelationControllerTest < ActionController::TestCase
     with_relation(relation.id) do |rel|
       update_changeset(rel, changeset.id)
       content rel
     with_relation(relation.id) do |rel|
       update_changeset(rel, changeset.id)
       content rel

-      put :update, :id => other_relation.id
+      put :update, :params => { :id => other_relation.id }

       assert_response :bad_request
     end
   end
       assert_response :bad_request
     end
   end


@@ -457,8 +461,8 @@ class RelationControllerTest < ActionController::TestCase
     basic_authorization user.email, "test"
 
     # create a relation with non-existing node as member
     basic_authorization user.email, "test"
 
     # 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' />" +
+    content "<osm><relation changeset='#{changeset.id}'>" \
+            "<member type='node' ref='0'/><tag k='test' v='yes' />" \

             "</relation></osm>"
     put :create
     # expect failure
             "</relation></osm>"
     put :create
     # expect failure


@@ -478,8 +482,8 @@ class RelationControllerTest < ActionController::TestCase
     basic_authorization user.email, "test"
 
     # create some xml that should return an error
     basic_authorization user.email, "test"
 
     # create some xml that should return an error

-    content "<osm><relation changeset='#{changeset.id}'>" +
-            "<member type='type' ref='#{node.id}' role=''/>" +
+    content "<osm><relation changeset='#{changeset.id}'>" \
+            "<member type='type' ref='#{node.id}' role=''/>" \

             "<tag k='tester' v='yep'/></relation></osm>"
     put :create
     # expect failure
             "<tag k='tester' v='yep'/></relation></osm>"
     put :create
     # expect failure


@@ -506,96 +510,96 @@ class RelationControllerTest < ActionController::TestCase
     create_list(:relation_tag, 4, :relation => multi_tag_relation)
 
     ## First try to delete relation without auth
     create_list(:relation_tag, 4, :relation => multi_tag_relation)
 
     ## First try to delete relation without auth

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :unauthorized
 
     ## Then try with the private user, to make sure that you get a forbidden
     assert_response :unauthorized
 
     ## Then try with the private user, to make sure that you get a forbidden

-    basic_authorization(private_user.email, "test")
+    basic_authorization private_user.email, "test"

 
     # this shouldn't work, as we should need the payload...
 
     # this shouldn't work, as we should need the payload...

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :forbidden
 
     # try to delete without specifying a changeset
     content "<osm><relation id='#{relation.id}'/></osm>"
     assert_response :forbidden
 
     # try to delete without specifying a changeset
     content "<osm><relation id='#{relation.id}'/></osm>"

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :forbidden
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(relation.to_xml,
                              private_user_closed_changeset.id)
     assert_response :forbidden
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(relation.to_xml,
                              private_user_closed_changeset.id)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(relation.to_xml, 0)
     assert_response :forbidden
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(relation.to_xml, 0)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :forbidden
 
     # this won't work because the relation is in-use by another relation
     content(used_relation.to_xml)
     assert_response :forbidden
 
     # this won't work because the relation is in-use by another relation
     content(used_relation.to_xml)

-    delete :delete, :id => used_relation.id
+    delete :delete, :params => { :id => used_relation.id }

     assert_response :forbidden
 
     # this should work when we provide the appropriate payload...
     content(relation.to_xml)
     assert_response :forbidden
 
     # this should work when we provide the appropriate payload...
     content(relation.to_xml)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :forbidden
 
     # this won't work since the relation is already deleted
     content(deleted_relation.to_xml)
     assert_response :forbidden
 
     # this won't work since the relation is already deleted
     content(deleted_relation.to_xml)

-    delete :delete, :id => deleted_relation.id
+    delete :delete, :params => { :id => deleted_relation.id }

     assert_response :forbidden
 
     # this won't work since the relation never existed
     assert_response :forbidden
 
     # this won't work since the relation never existed

-    delete :delete, :id => 0
+    delete :delete, :params => { :id => 0 }

     assert_response :forbidden
 
     ## now set auth for the public user
     assert_response :forbidden
 
     ## now set auth for the public user

-    basic_authorization(user.email, "test")
+    basic_authorization user.email, "test"

 
     # this shouldn't work, as we should need the payload...
 
     # this shouldn't work, as we should need the payload...

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :bad_request
 
     # try to delete without specifying a changeset
     content "<osm><relation id='#{relation.id}' version='#{relation.version}' /></osm>"
     assert_response :bad_request
 
     # try to delete without specifying a changeset
     content "<osm><relation id='#{relation.id}' version='#{relation.version}' /></osm>"

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :bad_request
     assert_match(/Changeset id is missing/, @response.body)
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(relation.to_xml,
                              closed_changeset.id)
     assert_response :bad_request
     assert_match(/Changeset id is missing/, @response.body)
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(relation.to_xml,
                              closed_changeset.id)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(relation.to_xml, 0)
     assert_response :conflict
 
     # try to delete with an invalid (non-existent) changeset
     content update_changeset(relation.to_xml, 0)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :conflict
 
     # this won't work because the relation is in a changeset owned by someone else
     content update_changeset(relation.to_xml, create(:changeset).id)
     assert_response :conflict
 
     # this won't work because the relation is in a changeset owned by someone else
     content update_changeset(relation.to_xml, create(:changeset).id)

-    delete :delete, :id => relation.id
+    delete :delete, :params => { :id => relation.id }

     assert_response :conflict,
                     "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 update_changeset(relation.to_xml, changeset.id)
     assert_response :conflict,
                     "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 update_changeset(relation.to_xml, changeset.id)

-    delete :delete, :id => create(:relation).id
+    delete :delete, :params => { :id => create(:relation).id }

     assert_response :bad_request, "shouldn't be able to delete a relation when payload is different to the url"
 
     # this won't work because the relation is in-use by another relation
     content update_changeset(used_relation.to_xml, changeset.id)
     assert_response :bad_request, "shouldn't be able to delete a relation when payload is different to the url"
 
     # this won't work because the relation is in-use by another relation
     content update_changeset(used_relation.to_xml, changeset.id)

-    delete :delete, :id => used_relation.id
+    delete :delete, :params => { :id => used_relation.id }

     assert_response :precondition_failed,
                     "shouldn't be able to delete a relation used in a relation (#{@response.body})"
     assert_equal "Precondition failed: The relation #{used_relation.id} is used in relation #{super_relation.id}.", @response.body
 
     # this should work when we provide the appropriate payload...
     content update_changeset(multi_tag_relation.to_xml, changeset.id)
     assert_response :precondition_failed,
                     "shouldn't be able to delete a relation used in a relation (#{@response.body})"
     assert_equal "Precondition failed: The relation #{used_relation.id} is used in relation #{super_relation.id}.", @response.body
 
     # this should work when we provide the appropriate payload...
     content update_changeset(multi_tag_relation.to_xml, changeset.id)

-    delete :delete, :id => multi_tag_relation.id
+    delete :delete, :params => { :id => multi_tag_relation.id }

     assert_response :success
 
     # valid delete should return the new version number, which should
     assert_response :success
 
     # valid delete should return the new version number, which should


@@ -605,23 +609,23 @@ class RelationControllerTest < ActionController::TestCase
 
     # this won't work since the relation is already deleted
     content update_changeset(deleted_relation.to_xml, changeset.id)
 
     # this won't work since the relation is already deleted
     content update_changeset(deleted_relation.to_xml, changeset.id)

-    delete :delete, :id => deleted_relation.id
+    delete :delete, :params => { :id => deleted_relation.id }

     assert_response :gone
 
     # Public visible relation needs to be deleted
     content update_changeset(super_relation.to_xml, changeset.id)
     assert_response :gone
 
     # Public visible relation needs to be deleted
     content update_changeset(super_relation.to_xml, changeset.id)

-    delete :delete, :id => super_relation.id
+    delete :delete, :params => { :id => super_relation.id }

     assert_response :success
 
     # this works now because the relation which was using this one
     # has been deleted.
     content update_changeset(used_relation.to_xml, changeset.id)
     assert_response :success
 
     # this works now because the relation which was using this one
     # has been deleted.
     content update_changeset(used_relation.to_xml, changeset.id)

-    delete :delete, :id => used_relation.id
+    delete :delete, :params => { :id => used_relation.id }

     assert_response :success,
                     "should be able to delete a relation used in an old relation (#{@response.body})"
 
     # this won't work since the relation never existed
     assert_response :success,
                     "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
+    delete :delete, :params => { :id => 0 }

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 


@@ -629,11 +633,18 @@ class RelationControllerTest < ActionController::TestCase
   # when a relation's tag is modified then it should put the bounding
   # box of all its members into the changeset.
   def test_tag_modify_bounding_box
   # when a relation's tag is modified then it should put the bounding
   # box of all its members into the changeset.
   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].
+    relation = create(:relation)
+    node1 = create(:node, :lat => 3, :lon => 3)
+    node2 = create(:node, :lat => 5, :lon => 5)
+    way = create(:way)
+    create(:way_node, :way => way, :node => node1)
+    create(:relation_member, :relation => relation, :member => way)
+    create(:relation_member, :relation => relation, :member => node2)
+    # the relation contains nodes1 and node2 (node1
+    # indirectly via the way), so the bbox should be [3,3,5,5].

     check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|
       # add a tag to an existing relation
     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_xml = relation.to_xml

       relation_element = relation_xml.find("//osm/relation").first
       new_tag = XML::Node.new("tag")
       new_tag["k"] = "some_new_tag"
       relation_element = relation_xml.find("//osm/relation").first
       new_tag = XML::Node.new("tag")
       new_tag["k"] = "some_new_tag"


@@ -645,7 +656,7 @@ class RelationControllerTest < ActionController::TestCase
 
       # upload the change
       content relation_xml
 
       # upload the change
       content relation_xml

-      put :update, :id => current_relations(:visible_relation).id
+      put :update, :params => { :id => relation.id }

       assert_response :success, "can't update relation for tag/bbox test"
     end
   end
       assert_response :success, "can't update relation for tag/bbox test"
     end
   end


@@ -679,11 +690,11 @@ class RelationControllerTest < ActionController::TestCase
 
         # upload the change
         content relation_xml
 
         # upload the change
         content relation_xml

-        put :update, :id => relation.id
+        put :update, :params => { :id => relation.id }

         assert_response :success, "can't update relation for add #{element.class}/bbox test: #{@response.body}"
 
         # get it back and check the ordering
         assert_response :success, "can't update relation for add #{element.class}/bbox test: #{@response.body}"
 
         # get it back and check the ordering

-        get :read, :id => relation.id
+        get :read, :params => { :id => relation.id }

         assert_response :success, "can't read back the relation: #{@response.body}"
         check_ordering(relation_xml, @response.body)
       end
         assert_response :success, "can't read back the relation: #{@response.body}"
         check_ordering(relation_xml, @response.body)
       end


@@ -694,11 +705,17 @@ 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

+    relation = create(:relation)
+    node1 = create(:node, :lat => 3, :lon => 3)
+    node2 = create(:node, :lat => 5, :lon => 5)
+    create(:relation_member, :relation => relation, :member => node1)
+    create(:relation_member, :relation => relation, :member => node2)
+

     check_changeset_modify(BoundingBox.new(5, 5, 5, 5)) do |changeset_id|
       # remove node 5 (5,5) from an existing relation
     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
+      relation_xml = relation.to_xml

       relation_xml
       relation_xml

-        .find("//osm/relation/member[@type='node'][@ref='5']")
+        .find("//osm/relation/member[@type='node'][@ref='#{node2.id}']")

         .first.remove!
 
       # update changeset ID to point to new changeset
         .first.remove!
 
       # update changeset ID to point to new changeset


@@ -706,7 +723,7 @@ class RelationControllerTest < ActionController::TestCase
 
       # upload the change
       content relation_xml
 
       # upload the change
       content relation_xml

-      put :update, :id => current_relations(:visible_relation).id
+      put :update, :params => { :id => relation.id }

       assert_response :success, "can't update relation for remove node/bbox test"
     end
   end
       assert_response :success, "can't update relation for remove node/bbox test"
     end
   end


@@ -722,17 +739,17 @@ class RelationControllerTest < ActionController::TestCase
     way1 = create(:way_with_nodes, :nodes_count => 2)
     way2 = create(:way_with_nodes, :nodes_count => 2)
 
     way1 = create(:way_with_nodes, :nodes_count => 2)
     way2 = create(:way_with_nodes, :nodes_count => 2)
 

-    basic_authorization(user.email, "test")
-
-    doc_str = <<OSM
-<osm>
- <relation changeset='#{changeset.id}'>
-  <member ref='#{node1.id}' type='node' role='first'/>
-  <member ref='#{node2.id}' type='node' role='second'/>
-  <member ref='#{way1.id}' type='way' role='third'/>
-  <member ref='#{way2.id}' type='way' role='fourth'/>
- </relation>
-</osm>
+    basic_authorization user.email, "test"
+
+    doc_str = <<OSM.strip_heredoc
+      <osm>
+       <relation changeset='#{changeset.id}'>
+        <member ref='#{node1.id}' type='node' role='first'/>
+        <member ref='#{node2.id}' type='node' role='second'/>
+        <member ref='#{way1.id}' type='way' role='third'/>
+        <member ref='#{way2.id}' type='way' role='fourth'/>
+       </relation>
+      </osm>

 OSM
     doc = XML::Parser.string(doc_str).parse
 
 OSM
     doc = XML::Parser.string(doc_str).parse
 


@@ -742,7 +759,7 @@ OSM
     relation_id = @response.body.to_i
 
     # get it back and check the ordering
     relation_id = @response.body.to_i
 
     # get it back and check the ordering

-    get :read, :id => relation_id
+    get :read, :params => { :id => relation_id }

     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 
     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 


@@ -758,18 +775,18 @@ OSM
 
     # upload the next version of the relation
     content doc
 
     # upload the next version of the relation
     content doc

-    put :update, :id => relation_id
+    put :update, :params => { :id => relation_id }

     assert_response :success, "can't update relation: #{@response.body}"
     assert_equal 2, @response.body.to_i
 
     # get it back again and check the ordering again
     assert_response :success, "can't update relation: #{@response.body}"
     assert_equal 2, @response.body.to_i
 
     # get it back again and check the ordering again

-    get :read, :id => relation_id
+    get :read, :params => { :id => relation_id }

     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 
     # check the ordering in the history tables:
     with_controller(OldRelationController.new) do
     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 
     # check the ordering in the history tables:
     with_controller(OldRelationController.new) do

-      get :version, :id => relation_id, :version => 2
+      get :version, :params => { :id => relation_id, :version => 2 }

       assert_response :success, "can't read back version 2 of the relation #{relation_id}"
       check_ordering(doc, @response.body)
     end
       assert_response :success, "can't read back version 2 of the relation #{relation_id}"
       check_ordering(doc, @response.body)
     end


@@ -784,27 +801,27 @@ OSM
     node1 = create(:node)
     node2 = create(:node)
 
     node1 = create(:node)
     node2 = create(:node)
 

-    doc_str = <<OSM
-<osm>
- <relation changeset='#{changeset.id}'>
-  <member ref='#{node1.id}' type='node' role='forward'/>
-  <member ref='#{node2.id}' type='node' role='forward'/>
-  <member ref='#{node1.id}' type='node' role='forward'/>
-  <member ref='#{node2.id}' type='node' role='forward'/>
- </relation>
-</osm>
+    doc_str = <<OSM.strip_heredoc
+      <osm>
+       <relation changeset='#{changeset.id}'>
+        <member ref='#{node1.id}' type='node' role='forward'/>
+        <member ref='#{node2.id}' type='node' role='forward'/>
+        <member ref='#{node1.id}' type='node' role='forward'/>
+        <member ref='#{node2.id}' type='node' role='forward'/>
+       </relation>
+      </osm>

 OSM
     doc = XML::Parser.string(doc_str).parse
 
     ## First try with the private user
 OSM
     doc = XML::Parser.string(doc_str).parse
 
     ## First try with the private user

-    basic_authorization(private_user.email, "test")
+    basic_authorization private_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(user.email, "test")
+    basic_authorization user.email, "test"

 
     content doc
     put :create
 
     content doc
     put :create


@@ -812,7 +829,7 @@ OSM
     relation_id = @response.body.to_i
 
     # get it back and check the ordering
     relation_id = @response.body.to_i
 
     # get it back and check the ordering

-    get :read, :id => relation_id
+    get :read, :params => { :id => relation_id }

     assert_response :success, "can't read back the relation: #{relation_id}"
     check_ordering(doc, @response.body)
   end
     assert_response :success, "can't read back the relation: #{relation_id}"
     check_ordering(doc, @response.body)
   end


@@ -827,18 +844,18 @@ OSM
     node3 = create(:node)
     node4 = create(:node)
 
     node3 = create(:node)
     node4 = create(:node)
 

-    doc_str = <<OSM
-<osm>
- <relation changeset='#{changeset.id}'>
-  <member ref='#{node1.id}' type='node' role='forward'/>
-  <member ref='#{node4.id}' type='node' role='forward'/>
-  <member ref='#{node3.id}' type='node' role='forward'/>
-  <member ref='#{node2.id}' type='node' role='forward'/>
- </relation>
-</osm>
+    doc_str = <<OSM.strip_heredoc
+      <osm>
+       <relation changeset='#{changeset.id}'>
+        <member ref='#{node1.id}' type='node' role='forward'/>
+        <member ref='#{node4.id}' type='node' role='forward'/>
+        <member ref='#{node3.id}' type='node' role='forward'/>
+        <member ref='#{node2.id}' type='node' role='forward'/>
+       </relation>
+      </osm>

 OSM
     doc = XML::Parser.string(doc_str).parse
 OSM
     doc = XML::Parser.string(doc_str).parse

-    basic_authorization(user.email, "test")
+    basic_authorization user.email, "test"

 
     content doc
     put :create
 
     content doc
     put :create


@@ -846,13 +863,13 @@ OSM
     relation_id = @response.body.to_i
 
     # check the ordering in the current tables:
     relation_id = @response.body.to_i
 
     # check the ordering in the current tables:

-    get :read, :id => relation_id
+    get :read, :params => { :id => relation_id }

     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 
     # check the ordering in the history tables:
     with_controller(OldRelationController.new) do
     assert_response :success, "can't read back the relation: #{@response.body}"
     check_ordering(doc, @response.body)
 
     # check the ordering in the history tables:
     with_controller(OldRelationController.new) do

-      get :version, :id => relation_id, :version => 1
+      get :version, :params => { :id => relation_id, :version => 1 }

       assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
       check_ordering(doc, @response.body)
     end
       assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
       check_ordering(doc, @response.body)
     end


@@ -862,8 +879,16 @@ 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

+    relation = create(:relation)
+    node1 = create(:node, :lat => 3, :lon => 3)
+    node2 = create(:node, :lat => 5, :lon => 5)
+    way = create(:way)
+    create(:way_node, :way => way, :node => node1)
+    create(:relation_member, :relation => relation, :member => way)
+    create(:relation_member, :relation => relation, :member => node2)
+

     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 = relation.to_xml

       relation_xml
         .find("//osm/relation/member")
         .each(&:remove!)
       relation_xml
         .find("//osm/relation/member")
         .each(&:remove!)


@@ -873,9 +898,9 @@ OSM
 
       # upload the change
       content relation_xml
 
       # upload the change
       content relation_xml

-      put :update, :id => current_relations(:visible_relation).id
+      put :update, :params => { :id => relation.id }

       assert_response :success, "can't update relation for remove all members test"
       assert_response :success, "can't update relation for remove all members test"

-      checkrelation = Relation.find(current_relations(:visible_relation).id)
+      checkrelation = Relation.find(relation.id)

       assert_not_nil(checkrelation,
                      "uploaded relation not found in database after upload")
       assert_equal(0, checkrelation.members.length,
       assert_not_nil(checkrelation,
                      "uploaded relation not found in database after upload")
       assert_equal(0, checkrelation.members.length,


@@ -911,7 +936,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(create(:user, :data_public => false).email, "test")
+    basic_authorization create(:user, :data_public => false).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.


@@ -922,7 +947,7 @@ OSM
     end
 
     ## Now do the whole thing with the public user
     end
 
     ## Now do the whole thing with the public user

-    basic_authorization(create(:user).email, "test")
+    basic_authorization create(: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.


@@ -938,14 +963,14 @@ OSM
 
     # now download the changeset to check its bounding box
     with_controller(ChangesetController.new) do
 
     # now download the changeset to check its bounding box
     with_controller(ChangesetController.new) do

-      get :read, :id => changeset_id
+      get :read, :params => { :id => changeset_id }

       assert_response :success, "can't re-read changeset for modify test"
       assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}"
       assert_select "osm>changeset[id='#{changeset_id}']", 1, "Changeset id=#{changeset_id} doesn't exist in #{@response.body}"
       assert_response :success, "can't re-read changeset for modify test"
       assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}"
       assert_select "osm>changeset[id='#{changeset_id}']", 1, "Changeset id=#{changeset_id} doesn't exist in #{@response.body}"

-      assert_select "osm>changeset[min_lon='#{bbox.min_lon}']", 1, "Changeset min_lon wrong in #{@response.body}"
-      assert_select "osm>changeset[min_lat='#{bbox.min_lat}']", 1, "Changeset min_lat wrong in #{@response.body}"
-      assert_select "osm>changeset[max_lon='#{bbox.max_lon}']", 1, "Changeset max_lon wrong in #{@response.body}"
-      assert_select "osm>changeset[max_lat='#{bbox.max_lat}']", 1, "Changeset max_lat wrong in #{@response.body}"
+      assert_select "osm>changeset[min_lon='#{format('%.7f', bbox.min_lon)}']", 1, "Changeset min_lon wrong in #{@response.body}"
+      assert_select "osm>changeset[min_lat='#{format('%.7f', bbox.min_lat)}']", 1, "Changeset min_lat wrong in #{@response.body}"
+      assert_select "osm>changeset[max_lon='#{format('%.7f', bbox.max_lon)}']", 1, "Changeset max_lon wrong in #{@response.body}"
+      assert_select "osm>changeset[max_lat='#{format('%.7f', bbox.max_lat)}']", 1, "Changeset max_lat wrong in #{@response.body}"

     end
   end
 
     end
   end
 


@@ -955,10 +980,10 @@ OSM
   # doc is returned.
   def with_relation(id, ver = nil)
     if ver.nil?
   # doc is returned.
   def with_relation(id, ver = nil)
     if ver.nil?

-      get :read, :id => id
+      get :read, :params => { :id => id }

     else
       with_controller(OldRelationController.new) do
     else
       with_controller(OldRelationController.new) do

-        get :version, :id => id, :version => ver
+        get :version, :params => { :id => id, :version => ver }

       end
     end
     assert_response :success
       end
     end
     assert_response :success


@@ -972,12 +997,12 @@ OSM
   def with_update(rel)
     rel_id = rel.find("//osm/relation").first["id"].to_i
     content rel
   def with_update(rel)
     rel_id = rel.find("//osm/relation").first["id"].to_i
     content rel

-    put :update, :id => rel_id
+    put :update, :params => { :id => rel_id }

     assert_response :success, "can't update relation: #{@response.body}"
     version = @response.body.to_i
 
     # now get the new version
     assert_response :success, "can't update relation: #{@response.body}"
     version = @response.body.to_i
 
     # now get the new version

-    get :read, :id => rel_id
+    get :read, :params => { :id => rel_id }

     assert_response :success
     new_rel = xml_parse(@response.body)
 
     assert_response :success
     new_rel = xml_parse(@response.body)
 


@@ -1004,13 +1029,13 @@ OSM
       modify << doc.import(rel.find("//osm/relation").first)
 
       content doc.to_s
       modify << doc.import(rel.find("//osm/relation").first)
 
       content doc.to_s

-      post :upload, :id => cs_id
+      post :upload, :params => { :id => cs_id }

       assert_response :success, "can't upload diff relation: #{@response.body}"
       version = xml_parse(@response.body).find("//diffResult/relation").first["new_version"].to_i
     end
 
     # now get the new version
       assert_response :success, "can't upload diff relation: #{@response.body}"
       version = xml_parse(@response.body).find("//diffResult/relation").first["new_version"].to_i
     end
 
     # now get the new version

-    get :read, :id => rel_id
+    get :read, :params => { :id => rel_id }

     assert_response :success
     new_rel = xml_parse(@response.body)
 
     assert_response :success
     new_rel = xml_parse(@response.body)
 


@@ -1038,7 +1063,7 @@ 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. " +
+                   "Tags which were not altered should be the same. " \

                    "#{a_tags.inspect} != #{b_tags.inspect}"
     end
   end
                    "#{a_tags.inspect} != #{b_tags.inspect}"
     end
   end