1 files changed, 44 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/string_ext_test.rb b/activesupport/test/core_ext/string_ext_test.rb
index bb865cae91..15e39a06c3 100644
--- a/activesupport/test/core_ext/string_ext_test.rb
+++ b/activesupport/test/core_ext/string_ext_test.rb
@@ -434,6 +434,50 @@ class OutputSafetyTest < ActiveSupport::TestCase
     assert string.html_safe?
   end
 
+  test "Joining safe elements without a separator is safe" do
+    array = 5.times.collect { "some string".html_safe }
+    assert array.safe_join.html_safe?
+  end
+
+  test "Joining safe elements with a safe separator is safe" do
+    array = 5.times.collect { "some string".html_safe }
+    assert array.safe_join("-".html_safe).html_safe?
+  end
+
+  test "Joining safe elements with an unsafe separator is unsafe" do
+    array = 5.times.collect { "some string".html_safe }
+    assert !array.safe_join("-").html_safe?
+  end
+
+  test "Joining is unsafe if any element is unsafe even with a safe separator" do
+    array = 5.times.collect { "some string".html_safe }
+    array << "some string"
+    assert !array.safe_join("-".html_safe).html_safe?
+  end
+
+  test "Joining is unsafe if any element is unsafe and no separator is given" do
+    array = 5.times.collect { "some string".html_safe }
+    array << "some string"
+    assert !array.safe_join.html_safe?
+  end
+
+  test "Joining is unsafe if any element is unsafe and the separator is unsafe" do
+    array = 5.times.collect { "some string".html_safe }
+    array << "some string"
+    assert !array.safe_join("-").html_safe?
+  end
+
+  test "Array is safe if all elements are safe" do
+    array = 5.times.collect { "some string".html_safe }
+    assert array.html_safe?
+  end
+
+  test "Array is unsafe if any element is unsafe" do
+    array = 5.times.collect { "some string".html_safe }
+    array << "some string"
+    assert !array.html_safe?
+  end
+
   test 'emits normal string yaml' do
     assert_equal 'foo'.to_yaml, 'foo'.html_safe.to_yaml(:foo => 1)
   end