mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make polymorphic_url compact given array [#1317 state:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
This commit is contained in:
parent
ff4ccb8334
commit
94d6716324
3 changed files with 14 additions and 1 deletions
|
@ -1,5 +1,7 @@
|
||||||
*2.2.1 [RC2 or 2.2 final]*
|
*2.2.1 [RC2 or 2.2 final]*
|
||||||
|
|
||||||
|
* Fixed that polymorphic_url should compact given array #1317 [hiroshi]
|
||||||
|
|
||||||
* Fixed the sanitize helper to avoid double escaping already properly escaped entities #683 [antonmos/Ryan McGeary]
|
* Fixed the sanitize helper to avoid double escaping already properly escaped entities #683 [antonmos/Ryan McGeary]
|
||||||
|
|
||||||
* Fixed that FormTagHelper generated illegal html if name contained square brackets #1238 [Vladimir Dobriakov]
|
* Fixed that FormTagHelper generated illegal html if name contained square brackets #1238 [Vladimir Dobriakov]
|
||||||
|
|
|
@ -73,7 +73,7 @@ module ActionController
|
||||||
#
|
#
|
||||||
def polymorphic_url(record_or_hash_or_array, options = {})
|
def polymorphic_url(record_or_hash_or_array, options = {})
|
||||||
if record_or_hash_or_array.kind_of?(Array)
|
if record_or_hash_or_array.kind_of?(Array)
|
||||||
record_or_hash_or_array = record_or_hash_or_array.dup
|
record_or_hash_or_array = record_or_hash_or_array.compact
|
||||||
end
|
end
|
||||||
|
|
||||||
record = extract_record(record_or_hash_or_array)
|
record = extract_record(record_or_hash_or_array)
|
||||||
|
|
|
@ -169,6 +169,17 @@ uses_mocha 'polymorphic URL helpers' do
|
||||||
polymorphic_url([@article, :response, @tag], :format => :pdf)
|
polymorphic_url([@article, :response, @tag], :format => :pdf)
|
||||||
end
|
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
|
||||||
|
|
||||||
# TODO: Needs to be updated to correctly know about whether the object is in a hash or not
|
# TODO: Needs to be updated to correctly know about whether the object is in a hash or not
|
||||||
def xtest_with_hash
|
def xtest_with_hash
|
||||||
expects(:article_url).with(@article)
|
expects(:article_url).with(@article)
|
||||||
|
|
Loading…
Reference in a new issue