kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

passing a nil in the polymorphic array is not supported. remove nils before you call the method

Browse source
This commit is contained in:
Aaron Patterson 2014-05-02 14:29:08 -07:00
parent 3d87c26845
commit c1c6f514f4
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
View file

@ -104,6 +104,10 @@ module ActionDispatch
recipient = self recipient = self
if record_or_hash_or_array.kind_of?(Array) if record_or_hash_or_array.kind_of?(Array)
if record_or_hash_or_array.any?(&:nil?)
raise ArgumentError, "Nil location provided. Can't build URI."
end
record_or_hash_or_array = record_or_hash_or_array.dup
if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy) if record_or_hash_or_array.first.is_a?(ActionDispatch::Routing::RoutesProxy)
recipient = record_or_hash_or_array.shift recipient = record_or_hash_or_array.shift
end end

8
actionview/test/activerecord/polymorphic_routes_test.rb
View file

@ -320,17 +320,17 @@ class PolymorphicRoutesTest < ActionController::TestCase
end end
end end
def test_nesting_with_array_containing_nil def test_nesting_with_array
with_test_routes do with_test_routes do
@project.save @project.save
assert_equal "http://example.com/projects/#{@project.id}/bid", polymorphic_url([@project, nil, :bid]) assert_equal "http://example.com/projects/#{@project.id}/bid", polymorphic_url([@project, :bid])
end end
end end
def test_with_array_containing_single_object def test_with_array_containing_single_object
with_test_routes do with_test_routes do
@project.save @project.save
assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url([nil, @project]) assert_equal "http://example.com/projects/#{@project.id}", polymorphic_url([@project])
end end
end end
@ -463,7 +463,7 @@ class PolymorphicRoutesTest < ActionController::TestCase
def test_with_array_containing_single_irregular_plural_object def test_with_array_containing_single_irregular_plural_object
with_test_routes do with_test_routes do
@tax.save @tax.save
assert_equal "http://example.com/taxes/#{@tax.id}", polymorphic_url([nil, @tax]) assert_equal "http://example.com/taxes/#{@tax.id}", polymorphic_url([@tax])
end end
end end