Merge branch 'master' into debian-jessie-backports

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

diff --git a/t/bestlink.t b/t/bestlink.t
index 9358bf3764b8b70afebab980b3316904f5602a62..0020a05e2ea9bc70a090fe069c1450899ca5caac 100755 (executable)
--- a/t/bestlink.t
+++ b/t/bestlink.t
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 use warnings;
 use strict;
 #!/usr/bin/perl
 use warnings;
 use strict;

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

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


@@ -11,10 +11,11 @@ sub test ($$$) {
        my @existing_pages=@{shift()};
        
        %IkiWiki::pagecase=();
        my @existing_pages=@{shift()};
        
        %IkiWiki::pagecase=();

-       %links=();
+       %pagesources=();
+       $IkiWiki::config{userdir}="foouserdir";

        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;
        foreach my $page (@existing_pages) {
                $IkiWiki::pagecase{lc $page}=$page;

-               $links{$page}=[];
+               $pagesources{$page}="$page.mdwn";

        }
 
        return bestlink($page, $link);
        }
 
        return bestlink($page, $link);


@@ -28,3 +29,5 @@ is(test("bar", "FoO", ["bar", "fOo"]), "fOo", "simple link with different page a
 is(test("bar", "Foo", ["bar", "fOo", "foo", "fOO", "Foo", "fOo"]), "Foo", "in case of ambiguity, like case wins");
 is(test("bar", "foo", ["bar", "foo", "bar/foo"]), "bar/foo", "simple subpage link");
 is(test("bar", "foo/subpage", ["bar", "foo", "bar/subpage", "foo/subpage"]), "foo/subpage", "cross subpage link");
 is(test("bar", "Foo", ["bar", "fOo", "foo", "fOO", "Foo", "fOo"]), "Foo", "in case of ambiguity, like case wins");
 is(test("bar", "foo", ["bar", "foo", "bar/foo"]), "bar/foo", "simple subpage link");
 is(test("bar", "foo/subpage", ["bar", "foo", "bar/subpage", "foo/subpage"]), "foo/subpage", "cross subpage link");

+is(test("bar", "bob", ["bar", "foo", "foouserdir/bob"]), "foouserdir/bob", "user link");
+is(test("bar", "bob", ["bar", "foo", "bob", "foouserdir/bob"]), "bob", "non-user link");