X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/922a000b192278754f9aef3e2bb3d9969bdc5368..24b21e4a29d28a3174965d449d36465ecda9ead7:/test/functional/relation_controller_test.rb

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 2893ba956..3c7025235 100644
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -42,9 +42,12 @@ class RelationControllerTest < Test::Unit::TestCase
     assert_response :not_found
 
     # check the "relations for node" mode
-    get :relations_for_node, :id => current_nodes(:used_node_1).id
+    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
@@ -57,9 +60,8 @@ class RelationControllerTest < Test::Unit::TestCase
         print @response.body
     end
 
-
     # check the "relations for relation" mode
-    get :relations_for_node, :id => current_relations(:used_relation).id
+    get :relations_for_relation, :id => current_relations(:used_relation).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE
@@ -67,7 +69,7 @@ class RelationControllerTest < Test::Unit::TestCase
     end
 
     # check the "full" mode
-    get :full, :id => current_relations(:relation_using_all).id
+    get :full, :id => current_relations(:visible_relation).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE
@@ -81,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>"
@@ -98,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"