1 files changed, 28 insertions, 10 deletions
diff --git a/actionpack/test/controller/polymorphic_routes_test.rb b/actionpack/test/controller/polymorphic_routes_test.rb
index 6ddf2826cd..09c7f74617 100644
--- a/actionpack/test/controller/polymorphic_routes_test.rb
+++ b/actionpack/test/controller/polymorphic_routes_test.rb
@@ -22,8 +22,7 @@ end
 class Response::Nested < Response; end
 
 uses_mocha 'polymorphic URL helpers' do
-  class PolymorphicRoutesTest < Test::Unit::TestCase
-
+  class PolymorphicRoutesTest < ActiveSupport::TestCase
     include ActionController::PolymorphicRoutes
 
     def setup
@@ -72,20 +71,22 @@ uses_mocha 'polymorphic URL helpers' do
       polymorphic_url(@article, :param1 => '10')
     end
 
-    def test_formatted_url_helper
-      expects(:formatted_article_url).with(@article, :pdf)
-      formatted_polymorphic_url([@article, :pdf])
+    def test_formatted_url_helper_is_deprecated
+      expects(:articles_url).with(:format => :pdf)
+      assert_deprecated do
+        formatted_polymorphic_url([@article, :pdf])
+      end
     end
 
     def test_format_option
       @article.save
-      expects(:formatted_article_url).with(@article, :pdf)
+      expects(:article_url).with(@article, :format => :pdf)
       polymorphic_url(@article, :format => :pdf)
     end
 
     def test_format_option_with_url_options
       @article.save
-      expects(:formatted_article_url).with(@article, :pdf, :param1 => '10')
+      expects(:article_url).with(@article, :format => :pdf, :param1 => '10')
       polymorphic_url(@article, :format => :pdf, :param1 => '10')
     end
 
@@ -158,17 +159,34 @@ uses_mocha 'polymorphic URL helpers' do
     def test_nesting_with_array_containing_singleton_resource_and_format
       @tag = Tag.new
       @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
-      formatted_polymorphic_url([@article, :response, @tag, :pdf])
+      expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
+      polymorphic_url([@article, :response, @tag], :format => :pdf)
     end
 
     def test_nesting_with_array_containing_singleton_resource_and_format_option
       @tag = Tag.new
       @tag.save
-      expects(:formatted_article_response_tag_url).with(@article, @tag, :pdf)
+      expects(:article_response_tag_url).with(@article, @tag, :format => :pdf)
       polymorphic_url([@article, :response, @tag], :format => :pdf)
     end
 
+    def test_nesting_with_array_containing_nil
+      expects(:article_response_url).with(@article)
+      polymorphic_url([@article, nil, :response])
+    end
+
+    def test_with_array_containing_single_object
+      @article.save
+      expects(:article_url).with(@article)
+      polymorphic_url([nil, @article])
+    end
+
+    def test_with_array_containing_single_name
+      @article.save
+      expects(:articles_url)
+      polymorphic_url([:articles])
+    end
+
     # TODO: Needs to be updated to correctly know about whether the object is in a hash or not
     def xtest_with_hash
       expects(:article_url).with(@article)