Added a test for trac ticket 4471, and fixed the issue.

diff --git a/app/models/relation.rb b/app/models/relation.rb
index e5ea85d6d02788eadec62b9768e6c19120b04854..ce19f7b98ca0ffc6805dc3a680d4cf7629f9d000 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -77,6 +77,12 @@ class Relation < ActiveRecord::Base
       relation.add_tag_keyval(tag['k'], tag['v'])
     end
 
       relation.add_tag_keyval(tag['k'], tag['v'])
     end
 

+    # need to initialise the relation members array explicitly, as if this
+    # isn't done for a new relation then @members attribute will be nil, 
+    # and the members will be loaded from the database instead of being 
+    # empty, as intended.
+    relation.members = Array.new
+

     pt.find('member').each do |member|
       #member_type = 
       logger.debug "each member"
     pt.find('member').each do |member|
       #member_type = 
       logger.debug "each member"

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 1f2640d4615ce728feabd965b57e5cbd94ab631a..c62496cd699b80fb81b92f7e75def650d42a14e8 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -751,6 +751,31 @@ OSM
     end
   end
 
     end
   end
 

+  ##
+  # 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|
+      relation_xml = current_relations(:visible_relation).to_xml
+      relation_xml.
+        find("//osm/relation/member").
+        each {|m| m.remove!}
+      
+      # update changeset ID to point to new changeset
+      update_changeset(relation_xml, changeset_id)
+      
+      # upload the change
+      content relation_xml
+      put :update, :id => current_relations(:visible_relation).id
+      assert_response :success, "can't update relation for remove all members test"
+      checkrelation = Relation.find(current_relations(:visible_relation).id)
+      assert_not_nil(checkrelation, 
+                     "uploaded relation not found in database after upload")
+      assert_equal(0, checkrelation.members.length,
+                   "relation contains members but they should have all been deleted")
+    end
+  end
+  

   # ============================================================
   # utility functions
   # ============================================================
   # ============================================================
   # utility functions
   # ============================================================