X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0d01b4f4260a820995065ffd80a71c74ad9ae99b..1004e6c739aaf2d66acd41e5a8a8fc3b6d4ba2c1:/t/linkify.t?ds=sidebyside

diff --git a/t/linkify.t b/t/linkify.t
index c7bfbcd38..6dff0a029 100755
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -1,12 +1,15 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
-use Test::More tests => 16;
+use Test::More tests => 32;
 
 BEGIN { use_ok("IkiWiki"); }
 
-# currently coded for non usedirs mode (TODO: check both)
-$config{usedirs}=0;
+# Initialize link plugin
+%config=IkiWiki::defaultconfig();
+IkiWiki::loadplugins();
+
+my $prefix_directives;
 
 sub linkify ($$$$) {
 	my $lpage=shift;
@@ -19,14 +22,21 @@ sub linkify ($$$$) {
 	# This could change, if so, update it..
 	%IkiWiki::pagecase=();
 	%links=();
-	foreach my $page (@existing_pages) {
-		$IkiWiki::pagecase{lc $page}=$page;
-		$links{$page}=[];
-		$renderedfiles{"$page.mdwn"}=[$page];
-		$destsources{$page}="$page.mdwn";
+	foreach my $p (@existing_pages) {
+		$IkiWiki::pagecase{lc $p}=$p;
+		$links{$p}=[];
+		$renderedfiles{"$p.mdwn"}=[$p];
+		$destsources{$p}="$p.mdwn";
 	}
+
 	%config=IkiWiki::defaultconfig();
 	$config{cgiurl}="http://somehost/ikiwiki.cgi";
+	$config{srcdir}=$config{destdir}="/dev/null"; # placate checkconfig
+	# currently coded for non usedirs mode (TODO: check both)
+	$config{usedirs}=0;
+	$config{prefix_directives}=$prefix_directives;
+
+	IkiWiki::checkconfig();
 
 	return IkiWiki::linkify($lpage, $page, $content);
 }
@@ -35,7 +45,7 @@ sub links_to ($$) {
 	my $link=shift;
 	my $content=shift;
 	
-	if ($content =~ m!<a href="[^"]*\Q$link\E[^"]*">!) {
+	if ($content =~ m!<a href="[^"]*\Q$link\E[^"]*"\s*[^>]*>!) {
 		return 1;
 	}
 	else {
@@ -70,19 +80,33 @@ sub links_text ($$) {
 	}
 }
 
+# Tests that are the same for both styles of prefix directives.
+foreach $prefix_directives (0,1) {
+	ok(links_to("bar", linkify("foo", "foo", "link to [[bar]] ok", ["foo", "bar"])), "ok link");
+	ok(links_to("bar_baz", linkify("foo", "foo", "link to [[bar_baz]] ok", ["foo", "bar_baz"])), "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_text("0", linkify("foo", "foo", "link to [[0|bar]] ok", ["foo", "bar"])), "named link to 0");
+	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#baz", linkify("foo",      "foo", "link to [[bar#baz]] ok", ["foo", "bar"])), "anchor link");
+}
+
+$prefix_directives=0;
+ok(not_links_to("some_page", linkify("foo", "foo", "link to [[some page]] ok", ["foo", "bar", "some_page"])),
+	"link with whitespace, without prefix_directives");
+ok(not_links_to("bar", linkify("foo", "foo", "link to [[some page|bar]] ok", ["foo", "bar"])),
+	"named link, with whitespace, without prefix_directives");
 
-ok(links_to("bar", linkify("foo", "foo", "link to [[bar]] ok", ["foo", "bar"])), "ok link");
-ok(links_to("bar_baz", linkify("foo", "foo", "link to [[bar_baz]] ok", ["foo", "bar_baz"])), "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("0", linkify("foo", "foo", "link to [[0|bar]] ok", ["foo", "bar"])), "named link to 0");
-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#baz", linkify("foo", "foo", "link to [[bar#baz]] ok", ["foo", "bar"])), "anchor link");
+$prefix_directives=1;
+ok(links_to("some_page", linkify("foo", "foo", "link to [[some page]] ok", ["foo", "bar", "some_page"])),
+	"link with whitespace");
+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");