Refactor the relation_for_nwr tests to use factories

[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 bb9286f1d2f7863c5f5d059807d94f7ae8039fbf..bb8f2d437c0038025aaba693e35360b0281bc137 100644 (file)
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -68,21 +68,65 @@ class RelationControllerTest < ActionController::TestCase
   # check that all relations containing a particular node, and no extra
   # relations, are returned from the relations_for_node call.
   def test_relations_for_node
+    node = create(:node)
+    # should include relations with that node as a member
+    relation_with_node = create(:relation_member, :member => node).relation
+    # should ignore relations without that node as a member
+    _relation_without_node = create(:relation_member).relation
+    # should ignore relations with the node involved indirectly, via a way
+    way = create(:way_node, :node => node).way
+    _relation_with_way = create(:relation_member, :member => way).relation
+    # should ignore relations with the node involved indirectly, via a relation
+    second_relation = create(:relation_member, :member => node).relation
+    _super_relation = create(:relation_member, :member => second_relation).relation
+    # should combine multiple relation_member references into just one relation entry
+    create(:relation_member, :member => node, :relation => relation_with_node, :sequence_id => 2)
+    # should not include deleted relations
+    deleted_relation = create(:relation, :deleted)
+    create(:relation_member, :member => node, :relation => deleted_relation)
+
     check_relations_for_element(:relations_for_node, "node",
-                                current_nodes(:node_used_by_relationship).id,
-                                [:visible_relation, :used_relation])
+                                node.id,
+                                [relation_with_node, second_relation])
   end
 
   def test_relations_for_way
+    way = create(:way)
+    # should include relations with that way as a member
+    relation_with_way = create(:relation_member, :member => way).relation
+    # should ignore relations without that way as a member
+    _relation_without_way = create(:relation_member).relation
+    # should ignore relations with the way involved indirectly, via a relation
+    second_relation = create(:relation_member, :member => way).relation
+    _super_relation = create(:relation_member, :member => second_relation).relation
+    # should combine multiple relation_member references into just one relation entry
+    create(:relation_member, :member => way, :relation => relation_with_way, :sequence_id => 2)
+    # should not include deleted relations
+    deleted_relation = create(:relation, :deleted)
+    create(:relation_member, :member => way, :relation => deleted_relation)
+
     check_relations_for_element(:relations_for_way, "way",
-                                current_ways(:used_way).id,
-                                [:visible_relation])
+                                way.id,
+                                [relation_with_way, second_relation])
   end
 
   def test_relations_for_relation
+    relation = create(:relation)
+    # should include relations with that relation as a member
+    relation_with_relation = create(:relation_member, :member => relation).relation
+    # should ignore any relation without that relation as a member
+    _relation_without_relation = create(:relation_member).relation
+    # should ignore relations with the relation involved indirectly, via a relation
+    second_relation = create(:relation_member, :member => relation).relation
+    _super_relation = create(:relation_member, :member => second_relation).relation
+    # should combine multiple relation_member references into just one relation entry
+    create(:relation_member, :member => relation, :relation => relation_with_relation, :sequence_id => 2)
+    # should not include deleted relations
+    deleted_relation = create(:relation, :deleted)
+    create(:relation_member, :member => relation, :relation => deleted_relation)
     check_relations_for_element(:relations_for_relation, "relation",
-                                current_relations(:used_relation).id,
-                                [:visible_relation])
+                                relation.id,
+                                [relation_with_relation, second_relation])
   end
 
   def check_relations_for_element(method, type, id, expected_relations)
@@ -96,10 +140,11 @@ class RelationControllerTest < ActionController::TestCase
     # we should have only the expected number of relations
     assert_select "osm>relation", expected_relations.size
 
-    # and each of them should contain the node we originally searched for
-    expected_relations.each do |r|
-      relation_id = current_relations(r).id
-      assert_select "osm>relation[id='#{relation_id}']>member[type='#{type}'][ref='#{id}']", 1
+    # and each of them should contain the element we originally searched for
+    expected_relations.each do |relation|
+      # The relation should appear once, but the element could appear multiple times
+      assert_select "osm>relation[id='#{relation.id}']", 1
+      assert_select "osm>relation[id='#{relation.id}']>member[type='#{type}'][ref='#{id}']"
     end
   end
 
@@ -165,8 +210,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,
@@ -177,7 +222,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,
@@ -188,9 +233,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,
@@ -233,8 +278,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,
@@ -265,7 +310,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,
@@ -296,9 +341,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,
@@ -337,6 +382,7 @@ class RelationControllerTest < ActionController::TestCase
   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|
@@ -366,6 +412,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
+    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|
@@ -412,8 +459,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,
@@ -432,8 +479,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
@@ -607,8 +654,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
@@ -963,7 +1009,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