diff options
author | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2012-03-18 15:31:41 +0000 |
commit | 4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9 (patch) | |
tree | 6759b80b8722ea532385c9a3ccc74897b784967d /t/htmlize.t | |
parent | d70ba7cff3fc6cc78ea2f8eb0713212478ab6ba7 (diff) | |
parent | 0a9bb3edc2a9819ba87de1b6e57155120b6aba44 (diff) | |
download | ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar ikiwiki-4e54fa1144065b7ff99e88e6c61ff1fdcf6175c9.tar.gz |
Merge tag '3.20120202' into trail3-integrated
Diffstat (limited to 't/htmlize.t')
-rwxr-xr-x | t/htmlize.t | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/t/htmlize.t b/t/htmlize.t index a436748f9..1569c8dcf 100755 --- a/t/htmlize.t +++ b/t/htmlize.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 32; +use Test::More tests => 31; use Encode; BEGIN { use_ok("IkiWiki"); } @@ -14,9 +14,8 @@ IkiWiki::checkconfig(); is(IkiWiki::htmlize("foo", "foo", "mdwn", "foo\n\nbar\n"), "<p>foo</p>\n\n<p>bar</p>\n", "basic"); -is(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test1.mdwn")), - Encode::decode_utf8(qq{<p><img src="../images/o.jpg" alt="o" title="ó" />\nóóóóó</p>\n}), - "utf8; bug #373203"); +my $val=Encode::encode_utf8(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test1.mdwn"))); +ok($val =~/ó/ && $val =~/óóóóó/, "utf8; bug #373203"); ok(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test2.mdwn")), "this file crashes markdown if it's fed in as decoded utf-8"); @@ -26,8 +25,6 @@ sub gotcha { } ok(!gotcha(q{<a href="javascript:alert('GOTCHA')">click me</a>}), "javascript url"); -ok(!gotcha(q{<a href="javascript:alert('GOTCHA')">click me</a>}), - "partially encoded javascript url"); ok(!gotcha(q{<a href="jscript:alert('GOTCHA')">click me</a>}), "jscript url"); ok(!gotcha(q{<a href="vbscript:alert('GOTCHA')">click me</a>}), |