Ticket #8601: fix2.diff

actionpack/test/controller/polymorphic_routes_test.rb

@@ +1 @@
+require File.dirname(__FILE__) + '/../abstract_unit'
+
+class Comment
+  attr_reader :id
+  def save; @id = 1 end
+  def new_record?; @id.nil? end
+  def name
+    @id.nil? ? 'new comment' : "comment ##{@id}"
+  end
+end
+
+class PolymorphicRoutesTest < Test::Unit::TestCase
+  include ActionController::PolymorphicRoutes
+  
+  def setup
+    @comment = Comment.new
+    @comment.save
+  end
+  
+  def test_polymorphic_url_with_object
+    assert_equal "/comment/1", polymorphic_url( @comment, :routing_type => :path )
+  end
+  
+  def test_polymorphic_url_with_array
+    assert_equal "/comment/1", polymorphic_url( [@comment], :routing_type => :path )
+  end
+  
+  def comment_path( comment )
+    "/comment/#{comment.id}"
+  end
+end

actionpack/lib/action_controller/polymorphic_routes.rb

@@ -11 +11 @@
-        when record.respond_to?(:new_record?) && record.new_record?
-          :plural
-        else
-[record_or_hash_or_array]
+Array(record_or_hash_or_array).dup
-          :singular
-        end
-