X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a6b84a0294a2929006ff056f56103be549c5b5a2..f6695c9079f4eeeecaa796c879868f797f97cd55:/test/controllers/relation_controller_test.rb

diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index 7e10159b4..ab0aca45e 100644
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -105,10 +105,15 @@ class RelationControllerTest < ActionController::TestCase
 
   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
     # FIXME: check whether this contains the stuff we want!
-    print @response.body if $VERBOSE
   end
 
   ##
@@ -160,8 +165,8 @@ class RelationControllerTest < ActionController::TestCase
     # 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,
@@ -172,7 +177,7 @@ class RelationControllerTest < ActionController::TestCase
     # 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,
@@ -183,9 +188,9 @@ class RelationControllerTest < ActionController::TestCase
     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,
@@ -228,8 +233,8 @@ class RelationControllerTest < ActionController::TestCase
     # 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,
@@ -260,7 +265,7 @@ class RelationControllerTest < ActionController::TestCase
     # 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,
@@ -291,9 +296,9 @@ class RelationControllerTest < ActionController::TestCase
     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,
@@ -382,6 +387,19 @@ class RelationControllerTest < ActionController::TestCase
     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.
   # -------------------------------------
@@ -394,8 +412,8 @@ class RelationControllerTest < ActionController::TestCase
 
     # 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,
@@ -414,8 +432,8 @@ class RelationControllerTest < ActionController::TestCase
 
     # 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
@@ -589,8 +607,7 @@ class RelationControllerTest < ActionController::TestCase
     [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
@@ -945,7 +962,7 @@ OSM
     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}"
+                   "#{a_tags.inspect} != #{b_tags.inspect}"
     end
   end