Merge branch 'strip-html-fix' of https://github.com/jamesallardice/liquid into jamesallardice-strip-html-fix

Conflicts:
	lib/liquid/standardfilters.rb
This commit is contained in:
Florian Weingarten
2013-06-18 04:11:11 +02:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -71,6 +71,7 @@ class StandardFiltersTest < Test::Unit::TestCase
assert_equal 'test', @filters.strip_html("<div>test</div>")
assert_equal 'test', @filters.strip_html("<div id='test'>test</div>")
assert_equal '', @filters.strip_html("<script type='text/javascript'>document.write('some stuff');</script>")
assert_equal '', @filters.strip_html("<style type='text/css'>foo bar</style>")
assert_equal 'test', @filters.strip_html("<div\nclass='multiline'>test</div>")
assert_equal 'test', @filters.strip_html("<!-- foo bar \n test -->test")
assert_equal '', @filters.strip_html(nil)