Merge remote-tracking branch 'openstreetmap/pull/1507'

[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 854fc51d0b5d14ce434bb51c0448888573a48758..0366ceef03a47812f13d88ba17353de44e5df045 100644 (file)
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -337,6 +337,7 @@ class RelationControllerTest < ActionController::TestCase
   def test_update_relation_tags
     basic_authorization "test@example.com", "test"
     rel_id = current_relations(:multi_tag_relation).id
   def test_update_relation_tags
     basic_authorization "test@example.com", "test"
     rel_id = current_relations(:multi_tag_relation).id

+    create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))

     cs_id = changesets(:public_user_first_change).id
 
     with_relation(rel_id) do |rel|
     cs_id = changesets(:public_user_first_change).id
 
     with_relation(rel_id) do |rel|


@@ -366,6 +367,7 @@ class RelationControllerTest < ActionController::TestCase
   def test_update_relation_tags_via_upload
     basic_authorization users(:public_user).email, "test"
     rel_id = current_relations(:multi_tag_relation).id
   def test_update_relation_tags_via_upload
     basic_authorization users(:public_user).email, "test"
     rel_id = current_relations(:multi_tag_relation).id

+    create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))

     cs_id = changesets(:public_user_first_change).id
 
     with_relation(rel_id) do |rel|
     cs_id = changesets(:public_user_first_change).id
 
     with_relation(rel_id) do |rel|


@@ -607,8 +609,7 @@ 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
       bbox = element.bbox.to_unscaled
       check_changeset_modify(bbox) do |changeset_id|
         relation_xml = Relation.find(relation_id).to_xml