Merge commit 'ea70d8ac7ae26f' into amp

af83 · Jan 22, 2009 · 3ee55f1 · 3ee55f1
2 parents 9b4c2db + ea70d8a
commit 3ee55f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
@@ -36,4 +36,4 @@ def array_to_sentence_string(array)
     end
 
   end  
-end
+end
diff --git a/test/test_filters.rb b/test/test_filters.rb
@@ -29,4 +29,9 @@ def test_array_to_sentence_string_with_multiple_args
     assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
   end
 
-end
+  def test_xml_escape_with_ampersands
+    assert_equal "AT&amp;T", @filter.xml_escape("AT&T")
+    assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
+  end
+
+end