Merge rails_port as of r4613 & fix tests.

[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 2893ba9560c51f8b34887305504c2812e8155b01..8f8b7277018eff50e43bea2fde6352c8437a0838 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -42,7 +42,7 @@ class RelationControllerTest < Test::Unit::TestCase
     assert_response :not_found
 
     # check the "relations for node" mode
     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!
     if $VERBOSE
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE


@@ -59,7 +59,7 @@ class RelationControllerTest < Test::Unit::TestCase
 
 
     # check the "relations for relation" mode
 
 
     # 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
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE


@@ -67,7 +67,7 @@ class RelationControllerTest < Test::Unit::TestCase
     end
 
     # check the "full" mode
     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
     assert_response :success
     # FIXME check whether this contains the stuff we want!
     if $VERBOSE