More nested polymorphic url helper fixes. Closes #6432, references #8601.

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

2 files changed, 80 insertions, 23 deletions

diff --git a/actionpack/test/controller/polymorphic_routes_test.rb b/actionpack/test/controller/polymorphic_routes_test.rb
new file mode 100644
index 0000000000..1d11eeda47
--- /dev/null
+++ b/actionpack/test/controller/polymorphic_routes_test.rb
@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class Article
+  attr_reader :id
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    @id.nil? ? 'new post' : "post ##{@id}"
+  end
+end
+
+class Comment
+  attr_reader :id
+  def post_id; 1 end
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    @id.nil? ? 'new comment' : "comment ##{@id}"
+  end
+end
+
+class Comment::Nested < Comment; end
+
+class Test::Unit::TestCase
+  protected
+  def articles_url
+    'http://www.example.com/articles'
+  end
+  alias_method :new_article_url, :articles_url
+  
+  def article_url(article)
+    "http://www.example.com/articles/#{article.id}"
+  end
+
+  def article_comments_url(article)
+    "http://www.example.com/articles/#{article.id}/comments"
+  end
+  
+  def article_comment_url(article, comment)
+    "http://www.example.com/articles/#{article.id}/comments/#{comment.id}"
+  end
+end
+
+
+class PolymorphicRoutesTest < Test::Unit::TestCase
+  include ActionController::PolymorphicRoutes
+
+  def setup
+    @article = Article.new
+    @comment = Comment.new
+  end
+  
+  def test_with_record
+    assert_equal(articles_url, polymorphic_url(@article, :action => 'new'))
+    assert_equal(articles_url, polymorphic_url(@article))
+    @article.save
+    assert_equal(article_url(@article), polymorphic_url(@article))
+  end
+  
+  def test_with_hash
+    @article.save
+    assert_equal(article_url(@article), polymorphic_url(:id => @article))
+  end
+  
+  def test_with_array
+    assert_equal(article_comments_url(@article), polymorphic_url([@article, @comment]))
+    @comment.save
+    assert_equal(article_comment_url(@article, @comment), polymorphic_url([@article, @comment]))
+  end
+end
diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb
index e83d7e0538..3d8368f700 100644
--- a/actionpack/test/template/form_helper_test.rb
+++ b/actionpack/test/template/form_helper_test.rb
@@ -38,6 +38,7 @@ class FormHelperTest < Test::Unit::TestCase
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::ActiveRecordHelper
   include ActionView::Helpers::RecordIdentificationHelper
+  include ActionController::PolymorphicRoutes
 
   def setup
     @post = Post.new
@@ -636,32 +637,18 @@ class FormHelperTest < Test::Unit::TestCase
     def comments_path(post)
       "/posts/#{post.id}/comments"
     end
+    alias_method :post_comments_path, :comments_path
 
     def comment_path(post, comment)
       "/posts/#{post.id}/comments/#{comment.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
-        record = record_or_hash_or_array
-        array = [ ]
-      end
-      
-      if array.size > 0
-        if record.new_record? 
-          "/posts/123/comments"
-        else
-          "/posts/123/comments/#{record.id}"
-        end
-      else
-        if record.new_record?
-          "/posts"
-        else
-          "/posts/#{record.id}"
-        end          
-      end        
+    alias_method :post_comment_path, :comment_path
+    
+    def posts_path
+      "/posts"
+    end 
+    
+    def post_path(post)
+      "/posts/#{post.id}"
     end
 end