additional consistency checks. making the error message for the number of nodes use...

[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 8f8b7277018eff50e43bea2fde6352c8437a0838..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


@@ -57,7 +60,6 @@ class RelationControllerTest < Test::Unit::TestCase
         print @response.body
     end
 
         print @response.body
     end
 

-

     # check the "relations for relation" mode
     get :relations_for_relation, :id => current_relations(:used_relation).id
     assert_response :success
     # check the "relations for relation" mode
     get :relations_for_relation, :id => current_relations(:used_relation).id
     assert_response :success


@@ -81,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>"


@@ -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"
         "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"