X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/282893be819eab14f3a2078f1741ec9c9ed363b1..4c4416f97e555070d4e80f06e5a8c9accb586087:/t/linkify.t

diff --git a/t/linkify.t b/t/linkify.t
index 47eee6e0d..e11c3abba 100755
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -1,23 +1,30 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 11;
+use Test::More tests => 13;
 
-sub linkify ($$$) {
+BEGIN { use_ok("IkiWiki"); }
+
+sub linkify ($$$$) {
+	my $lpage=shift;
 	my $page=shift;
+
 	my $content=shift;
 	my @existing_pages=@{shift()};
 	
 	# This is what linkify and htmllink need set right now to work.
 	# This could change, if so, update it..
-	%IkiWiki::links=();
+	%IkiWiki::pagecase=();
+	%links=();
 	foreach my $page (@existing_pages) {
-		$IkiWiki::links{$page}=[];
-		$IkiWiki::renderedfiles{"$page.mdwn"}=$page;
+		$IkiWiki::pagecase{lc $page}=$page;
+		$links{$page}=[];
+		$renderedfiles{"$page.mdwn"}=[$page];
 	}
-	%IkiWiki::config=IkiWiki::defaultconfig();
+	%config=IkiWiki::defaultconfig();
+	$config{cgiurl}="http://somehost/ikiwiki.cgi";
 
-	return IkiWiki::linkify($page, $content);
+	return IkiWiki::linkify($lpage, $page, $content);
 }
 
 sub links_to ($$) {
@@ -60,15 +67,16 @@ sub links_text ($$) {
 }
 
 
-BEGIN { use_ok("IkiWiki::Render"); }
+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");
 
-ok(links_to("bar", linkify("foo", "link to [[bar]] ok", ["foo", "bar"])), "ok link");
-ok(not_links_to("bar", linkify("foo", "link to \\[[bar]] ok", ["foo", "bar"])), "escaped link");
-ok(links_to("page=bar", linkify("foo", "link to [[bar]] ok", ["foo"])), "broken link");
-ok(links_to("bar", linkify("foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("baz", linkify("foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("bar", linkify("foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link");
-ok(links_text("some page", linkify("foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link text");
-ok(links_to("bar", linkify("foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link, with whitespace");
-ok(links_text("some page", linkify("foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link text, with whitespace");
-ok(links_text("Some long, & complex page name.", linkify("foo", "link to [[Some long, & complex page name.|bar]] ok, and this is not a link]] here", ["foo", "bar"])), "complex named link text");