Fix incomplete work from [6951] that was hidden by test stubs. Closes #6432.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 18 insertions, 10 deletions

diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index c504190960..e83d7e0538 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -641,19 +641,27 @@ class FormHelperTest < Test::Unit::TestCase
       "/posts/#{post.id}/comments/#{comment.id}"
     end
 
-    def polymorphic_path(object, *nested_objects)
-      if nested_objects.empty?
-        if object.new_record?
-          "/posts"
-        else
-          "/posts/#{object.id}"
-        end
+    def polymorphic_path(record_or_hash_or_array)  
+      if record_or_hash_or_array.is_a?(Array)
+        record = record_or_hash_or_array.pop
+        array = record_or_hash_or_array
       else
-        if object.new_record?
+        record = record_or_hash_or_array
+        array = [ ]
+      end
+      
+      if array.size > 0
+        if record.new_record? 
           "/posts/123/comments"
         else
-          "/posts/123/comments/#{object.id}"
+          "/posts/123/comments/#{record.id}"
         end
-      end
+      else
+        if record.new_record?
+          "/posts"
+        else
+          "/posts/#{record.id}"
+        end          
+      end        
     end
 end