* Ship ikiwiki executable as ikiwiki.pl in source to avoid issues on

[git.ikiwiki.info.git] / t / linkify.t

diff --git a/t/linkify.t b/t/linkify.t
index c231d734bf6491cea5684e75e0de7b0dd6f83694..d1d02cd2731cb2c170871344c6438a52347c982a 100755 (executable)
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -1,11 +1,13 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

-use Test::More tests => 11;
+use Test::More tests => 13;

 
 

-sub linkify ($$$) {
-       my $content=shift;
+sub linkify ($$$$) {
+       my $lpage=shift;

        my $page=shift;
        my $page=shift;

+
+       my $content=shift;

        my @existing_pages=@{shift()};
        
        # This is what linkify and htmllink need set right now to work.
        my @existing_pages=@{shift()};
        
        # This is what linkify and htmllink need set right now to work.


@@ -17,7 +19,7 @@ sub linkify ($$$) {
        }
        %IkiWiki::config=IkiWiki::defaultconfig();
 
        }
        %IkiWiki::config=IkiWiki::defaultconfig();
 

-       return IkiWiki::linkify($content, $page);
+       return IkiWiki::linkify($lpage, $page, $content);

 }
 
 sub links_to ($$) {
 }
 
 sub links_to ($$) {


@@ -62,13 +64,16 @@ sub links_text ($$) {
 
 BEGIN { use_ok("IkiWiki::Render"); }
 
 
 BEGIN { use_ok("IkiWiki::Render"); }
 

-ok(links_to("bar", linkify("link to [[bar]] ok", "foo", ["foo", "bar"])), "ok link");
-ok(not_links_to("bar", linkify("link to \\[[bar]] ok", "foo", ["foo", "bar"])), "escaped link");
-ok(links_to("page=bar", linkify("link to [[bar]] ok", "foo", ["foo"])), "broken link");
-ok(links_to("bar", linkify("link to [[baz]] and [[bar]] ok", "foo", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("baz", linkify("link to [[baz]] and [[bar]] ok", "foo", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("bar", linkify("link to [[some_page|bar]] ok", "foo", ["foo", "bar"])), "named link");
-ok(links_text("some page", linkify("link to [[some_page|bar]] ok", "foo", ["foo", "bar"])), "named link text");
-ok(links_to("bar", linkify("link to [[some page|bar]] ok", "foo", ["foo", "bar"])), "named link, with whitespace");
-ok(links_text("some page", linkify("link to [[some page|bar]] ok", "foo", ["foo", "bar"])), "named link text, with whitespace");
-ok(links_text("Some long, & complex page name.", linkify("link to [[Some long, & complex page name.|bar]] ok, and this is not a link]] here", "foo", ["foo", "bar"])), "complex named link text");
+ok(links_to("bar", linkify("foo", "foo", "link to [[bar]] ok", ["foo", "bar"])), "ok link");
+ok(not_links_to("bar", linkify("foo", "foo", "link to \\[[bar]] ok", ["foo", "bar"])), "escaped link");
+ok(links_to("page=bar", linkify("foo", "foo", "link to [[bar]] ok", ["foo"])), "broken link");
+ok(links_to("bar", linkify("foo", "foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
+ok(links_to("baz", linkify("foo", "foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
+ok(links_to("bar", linkify("foo", "foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link");
+ok(links_text("some page", linkify("foo", "foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link text");
+ok(links_to("bar", linkify("foo", "foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link, with whitespace");
+ok(links_text("some page", linkify("foo", "foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link text, with whitespace");
+ok(links_text("Some long, & complex page name.", linkify("foo", "foo", "link to [[Some long, & complex page name.|bar]] ok, and this is not a link]] here", ["foo", "bar"])), "complex named link text");
+ok(links_to("foo/bar", linkify("foo/item", "foo", "link to [[bar]] ok", ["foo", "foo/item", "foo/bar"])), "inline page link");
+ok(links_to("bar", linkify("foo", "foo", "link to [[bar]] ok", ["foo", "foo/item", "foo/bar"])), "same except not inline");
+