test/template/erb_util_test.rb in actionpack-2.3.5 vs test/template/erb_util_test.rb in actionpack-2.3.6

@@ -12,9 +12,21 @@
       define_method "test_json_escape_#{expected.gsub /\W/, ''}" do
         assert_equal ERB::Util::JSON_ESCAPE[given], json_escape(given)
       end
     end
   end
+
+  def test_html_escape_is_html_safe
+    escaped = h("<p>")
+    assert_equal "&lt;p&gt;", escaped
+    assert escaped.html_safe?
+  end
+
+  def test_html_escape_passes_html_escpe_unmodified
+    escaped = h("<p>".html_safe)
+    assert_equal "<p>", escaped
+    assert escaped.html_safe?
+  end
   
   def test_rest_in_ascii
     (0..127).to_a.map(&:chr).each do |chr|
       next if %w(& " < >).include?(chr)
       assert_equal chr, html_escape(chr)