1 files changed, 54 insertions, 1 deletions

diff --git a/actionpack/test/activerecord/polymorphic_routes_test.rb b/actionpack/test/activerecord/polymorphic_routes_test.rb
index 2036d1eeb5..37f1f6dff8 100644
--- a/actionpack/test/activerecord/polymorphic_routes_test.rb
+++ b/actionpack/test/activerecord/polymorphic_routes_test.rb
@@ -45,6 +45,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
       assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url(@project)
     end
   end
+  
+  def test_with_class
+    with_test_routes do
+      assert_equal "http://example.com/projects", polymorphic_url(@project.class)
+    end
+  end
 
   def test_with_new_record
     with_test_routes do 
@@ -52,6 +58,13 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
 
+  def test_with_destroyed_record
+    with_test_routes do 
+      @project.destroy
+      assert_equal "http://example.com/projects", polymorphic_url(@project)
+    end
+  end
+
   def test_with_record_and_action
     with_test_routes do 
       assert_equal "http://example.com/projects/new", polymorphic_url(@project, :action => 'new')
@@ -129,6 +142,27 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_with_nested_destroyed
+    with_test_routes do
+      @project.save
+      @task.destroy
+      assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task])
+    end
+  end
+  
+  def test_with_nested_class
+    with_test_routes do
+      @project.save
+      assert_equal "http://example.com/projects/#{@project.id}/tasks", polymorphic_url([@project, @task.class])
+    end
+  end
+  
+  def test_class_with_array_and_namespace
+    with_admin_test_routes do 
+      assert_equal "http://example.com/admin/projects", polymorphic_url([:admin, @project.class])
+    end
+  end
+  
   def test_new_with_array_and_namespace
     with_admin_test_routes do 
       assert_equal "http://example.com/admin/projects/new", polymorphic_url([:admin, @project], :action => 'new')
@@ -252,11 +286,24 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_with_irregular_plural_class
+    with_test_routes do 
+      assert_equal "http://example.com/taxes", polymorphic_url(@tax.class)
+    end
+  end
+  
   def test_with_irregular_plural_new_record
     with_test_routes do 
       assert_equal "http://example.com/taxes", polymorphic_url(@tax)
     end
   end
+
+  def test_with_irregular_plural_destroyed_record
+    with_test_routes do
+      @tax.destroy 
+      assert_equal "http://example.com/taxes", polymorphic_url(@tax)
+    end
+  end
   
   def test_with_irregular_plural_record_and_action
     with_test_routes do 
@@ -298,6 +345,12 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
   
+  def test_class_with_irregular_plural_array_and_namespace
+    with_admin_test_routes do 
+      assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax.class])
+    end
+  end
+  
   def test_unsaved_with_irregular_plural_array_and_namespace
     with_admin_test_routes do 
       assert_equal "http://example.com/admin/taxes", polymorphic_url([:admin, @tax])
@@ -395,4 +448,4 @@ class PolymorphicRoutesTest < ActionController::TestCase
     end
   end
 
-end
\ No newline at end of file
+end