Merge pull request #38117 from nicolasdular/nicolasdular/fix-frozen-strings-in-to-sentence

Return unfrozen strings from to_sentence

activesupport/CHANGELOG.md

+*   `Array#to_sentence` no longer returns a frozen string.
+
+    Before:
+        ['one', 'two'].to_sentence.frozen?
+        # => true
+
+    After:
+        ['one', 'two'].to_sentence.frozen?
+        # => false
+
+    *Nicolas Dular*
+
 *   Update `ActiveSupport::Messages::Metadata#fresh?` to work for cookies with expiry set when
     `ActiveSupport.parse_json_times = true`.
 

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

@@ -74,13 +74,13 @@ def to_sentence(options = {})
 
     case length
     when 0
-      ""
+      +""
     when 1
-      "#{self[0]}"
+      +"#{self[0]}"
     when 2
-      "#{self[0]}#{options[:two_words_connector]}#{self[1]}"
+      +"#{self[0]}#{options[:two_words_connector]}#{self[1]}"
     else
-      "#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
+      +"#{self[0...-1].join(options[:words_connector])}#{options[:last_word_connector]}#{self[-1]}"
     end
   end
 

activesupport/test/core_ext/array/conversions_test.rb

@@ -68,6 +68,13 @@ def test_always_returns_string
     assert_instance_of String, [ActiveSupport::SafeBuffer.new("one"), "two"].to_sentence
     assert_instance_of String, [ActiveSupport::SafeBuffer.new("one"), "two", "three"].to_sentence
   end
+
+  def test_returns_no_frozen_string
+    assert_not [].to_sentence.frozen?
+    assert_not ["one"].to_sentence.frozen?
+    assert_not ["one", "two"].to_sentence.frozen?
+    assert_not ["one", "two", "three"].to_sentence.frozen?
+  end
 end
 
 class ToSTest < ActiveSupport::TestCase