Some comment about where to add code to get some more of the functional changesets...

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 202a015a87f737459b13ec30a4055e9dc5c67a37..3c702523539607a58bb26682a4157236a22b6927 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -45,6 +45,9 @@ class RelationControllerTest < Test::Unit::TestCase
     get :relations_for_node, :id => current_nodes(:node_used_by_relationship).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     get :relations_for_node, :id => current_nodes(:node_used_by_relationship).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!

+    # see the test_read in way_controller_test.rb for the assert_select
+    assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+    assert_select "osm relation"

     if $VERBOSE
         print @response.body
     end
     if $VERBOSE
         print @response.body
     end


@@ -80,6 +83,8 @@ class RelationControllerTest < Test::Unit::TestCase
 
   def test_create
     basic_authorization "test@openstreetmap.org", "test"
 
   def test_create
     basic_authorization "test@openstreetmap.org", "test"

+    
+    # FIXME create a new changeset and use the id that is returned for the next step

 
     # create an relation without members
     content "<osm><relation><tag k='test' v='yes' /></relation></osm>"
 
     # create an relation without members
     content "<osm><relation><tag k='test' v='yes' /></relation></osm>"


@@ -97,7 +102,7 @@ class RelationControllerTest < Test::Unit::TestCase
         "saved relation contains members but should not"
     assert_equal checkrelation.tags.length, 1, 
         "saved relation does not contain exactly one tag"
         "saved relation contains members but should not"
     assert_equal checkrelation.tags.length, 1, 
         "saved relation does not contain exactly one tag"

-    assert_equal users(:normal_user).id, checkrelation.user_id, 
+    assert_equal users(:normal_user).id, checkrelation.changeset.user_id, 

         "saved relation does not belong to user that created it"
     assert_equal true, checkrelation.visible, 
         "saved relation is not visible"
         "saved relation does not belong to user that created it"
     assert_equal true, checkrelation.visible, 
         "saved relation is not visible"

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 6fd3e234c94ca326ae338c80b82a243a1afb3fb9..b4f4599a407e1857b144e54bee4df7c2313b8281 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -76,6 +76,8 @@ class WayControllerTest < Test::Unit::TestCase
     nid2 = current_nodes(:used_node_2).id
     basic_authorization "test@openstreetmap.org", "test"
 
     nid2 = current_nodes(:used_node_2).id
     basic_authorization "test@openstreetmap.org", "test"
 

+    # FIXME create a new changeset and use the id that is returned for the next step
+    

     # create a way with pre-existing nodes
     content "<osm><way><nd ref='#{nid1}'/><nd ref='#{nid2}'/><tag k='test' v='yes' /></way></osm>"
     put :create
     # create a way with pre-existing nodes
     content "<osm><way><nd ref='#{nid1}'/><nd ref='#{nid2}'/><tag k='test' v='yes' /></way></osm>"
     put :create