Fixed node functional tests. A couple of changes to the old_node model and node contr...

[rails.git] / test / functional / relation_controller_test.rb

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index d5a4d910541aceff58991ab366315cbe5933b1fc..3c702523539607a58bb26682a4157236a22b6927 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -40,6 +40,41 @@ class RelationControllerTest < Test::Unit::TestCase
     # check chat a non-existent relation is not returned
     get :read, :id => 0
     assert_response :not_found
+
+    # check the "relations for node" mode
+    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
+
+    # check the "relations for way" mode
+    get :relations_for_way, :id => current_ways(:used_way).id
+    assert_response :success
+    # FIXME check whether this contains the stuff we want!
+    if $VERBOSE
+        print @response.body
+    end
+
+    # check the "relations for relation" mode
+    get :relations_for_relation, :id => current_relations(:used_relation).id
+    assert_response :success
+    # FIXME check whether this contains the stuff we want!
+    if $VERBOSE
+        print @response.body
+    end
+
+    # check the "full" mode
+    get :full, :id => current_relations(:visible_relation).id
+    assert_response :success
+    # FIXME check whether this contains the stuff we want!
+    if $VERBOSE
+        print @response.body
+    end
   end
 
   # -------------------------------------
@@ -48,6 +83,8 @@ class RelationControllerTest < Test::Unit::TestCase
 
   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>"
@@ -65,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"
-    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"