the git repo has been redone using git-svnimport, which seems to work better and...

[ikiwiki.git] / t / htmlize.t

diff --git a/t/htmlize.t b/t/htmlize.t
index 070fbf9584740a1f5b65e37c40e0a79c9bb5ad69..a9ccfedcbb184b9a31165b63d9009f012416cbf5 100755 (executable)
--- a/t/htmlize.t
+++ b/t/htmlize.t
@@ -1,22 +1,21 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More tests => 5;
+use Test::More tests => 4;

 use Encode;
 
 BEGIN { use_ok("IkiWiki"); }
 use Encode;
 
 BEGIN { use_ok("IkiWiki"); }

-BEGIN { use_ok("IkiWiki::Render"); }

 
 # Initialize htmlscrubber plugin
 
 # Initialize htmlscrubber plugin

-%IkiWiki::config=IkiWiki::defaultconfig();
-$IkiWiki::config{srcdir}=$IkiWiki::config{destdir}="/dev/null";
+%config=IkiWiki::defaultconfig();
+$config{srcdir}=$config{destdir}="/dev/null";

 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 

-is(IkiWiki::htmlize("mdwn", "foo\n\nbar\n"), "<p>foo</p>\n\n<p>bar</p>\n",
+is(IkiWiki::htmlize("foo", "mdwn", "foo\n\nbar\n"), "<p>foo</p>\n\n<p>bar</p>\n",

        "basic");
        "basic");

-is(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test1.mdwn")),
+is(IkiWiki::htmlize("foo", "mdwn", readfile("t/test1.mdwn")),

        Encode::decode_utf8(qq{<p><img src="../images/o.jpg" alt="o" title="&oacute;" />\nóóóóó</p>\n}),
        "utf8; bug #373203");
        Encode::decode_utf8(qq{<p><img src="../images/o.jpg" alt="o" title="&oacute;" />\nóóóóó</p>\n}),
        "utf8; bug #373203");

-ok(IkiWiki::htmlize("mdwn", IkiWiki::readfile("t/test2.mdwn")),
+ok(IkiWiki::htmlize("foo", "mdwn", readfile("t/test2.mdwn")),

        "this file crashes markdown if it's fed in as decoded utf-8");
        "this file crashes markdown if it's fed in as decoded utf-8");