diff options
| -rw-r--r-- | activesupport/lib/active_support/core_ext/array/conversions.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/core_ext/array_ext_test.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb index 2c84329178..b7d4434e85 100644 --- a/activesupport/lib/active_support/core_ext/array/conversions.rb +++ b/activesupport/lib/active_support/core_ext/array/conversions.rb @@ -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 diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb index 5831e2a56a..d8ec45b62a 100644 --- a/activesupport/test/core_ext/array_ext_test.rb +++ b/activesupport/test/core_ext/array_ext_test.rb @@ -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 |