mirror of
https://github.com/github/rails.git
synced 2026-01-29 16:28:09 -05:00
to_sentence returns self[0].to_s instead of just self[0] for arrays of length 1. Closes #10390 [Chu Yeow, mrj]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8340 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -16,7 +16,7 @@ module ActiveSupport #:nodoc:
|
||||
when 0
|
||||
""
|
||||
when 1
|
||||
self[0]
|
||||
self[0].to_s
|
||||
when 2
|
||||
"#{self[0]} #{options[:connector]}#{self[1]}"
|
||||
else
|
||||
|
||||
@@ -33,7 +33,6 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
|
||||
assert_equal "one", ['one'].to_sentence
|
||||
assert_equal "one and two", ['one', 'two'].to_sentence
|
||||
assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence
|
||||
|
||||
end
|
||||
|
||||
def test_to_sentence_with_connector
|
||||
@@ -57,6 +56,9 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
|
||||
assert_equal "one", ['one'].to_sentence
|
||||
end
|
||||
|
||||
def test_one_non_string_element
|
||||
assert_equal '1', [1].to_sentence
|
||||
end
|
||||
end
|
||||
|
||||
class ArrayExtToSTests < Test::Unit::TestCase
|
||||
|
||||
Reference in New Issue
Block a user