Changeset 8340

Timestamp:

12/09/07 22:10:40 (5 months ago)

Author:

bitsweat

Message:

to_sentence returns self[0].to_s instead of just self[0] for arrays of length 1. Closes #10390 [Chu Yeow, mrj]

Files:

• trunk/activesupport/lib/active_support/core_ext/array/conversions.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/array_ext_test.rb (modified) (2 diffs)

trunk/activesupport/lib/active_support/core_ext/array/conversions.rb

@@ -17 +17 @@
-              ""
-            when 1
-
+.to_s
-            when 2
-              "#{self[0]} #{options[:connector]}#{self[1]}"

trunk/activesupport/test/core_ext/array_ext_test.rb

@@ -34 +34 @@
-    assert_equal "one and two", ['one', 'two'].to_sentence
-    assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence
-
-  end
-
@@ -58 +57 @@
-  end
-
+  def test_one_non_string_element
+    assert_equal '1', [1].to_sentence
+  end
-end
-