Add test to make sure that add two safe buffers always return a safe buffer

1 files changed, 7 insertions, 0 deletions

diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index 8f77999d25..c7a4c9f7e8 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -96,6 +96,13 @@ class SafeBufferTest < ActiveSupport::TestCase
     assert !@buffer.dup.html_safe?
   end
 
+  test "Should return safe buffer when added with another safe buffer" do
+    clean = "<script>".html_safe
+    result_buffer = @buffer + clean
+    assert result_buffer.html_safe?
+    assert_equal "<script>", result_buffer
+  end
+
   test "Should raise an error when safe_concat is called on dirty buffers" do
     @buffer.gsub!('', '<>')
     assert_raise ActiveSupport::SafeBuffer::SafeConcatError do