X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/258ee1bc3b9c43807064c771ebcb9ce2840d4264..8d4342183b1c3a96797def6fff96feebacb90db6:/t/trail.t diff --git a/t/trail.t b/t/trail.t index 2e4b9278d..ed180d35c 100755 --- a/t/trail.t +++ b/t/trail.t @@ -1,7 +1,8 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More 'no_plan'; +use Cwd qw(getcwd); +use Test::More; use IkiWiki; sub check_trail { @@ -15,11 +16,11 @@ sub check_trail { sub check_no_trail { my $file=shift; - my $trailname=shift; + my $trailname=shift || qr/\w+/; my $blob=readfile("t/tmp/out/$file"); my ($trailline)=$blob=~/^trail=$trailname\s+(.*)$/m; $trailline="" unless defined $trailline; - ok($trailline !~ /^trail=$trailname\s+/, "no $trailname in $file"); + ok($trailline !~ /^trail=$trailname\s+/, "no trail $trailname in $file"); } my $blob; @@ -27,6 +28,24 @@ my $blob; ok(! system("rm -rf t/tmp")); ok(! system("mkdir t/tmp")); +my $installed = $ENV{INSTALLED_TESTS}; + +my @command; +if ($installed) { + @command = qw(ikiwiki); +} +else { + ok(! system("make -s ikiwiki.out")); + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out + --underlaydir=underlays/basewiki + --set underlaydirbase=underlays + --templatedir=templates)); +} + +push @command, qw(--set usedirs=0 --plugin trail --plugin inline + --url=http://example.com --cgiurl=http://example.com/ikiwiki.cgi + --rss --atom t/tmp/in t/tmp/out --verbose); + # Write files with a date in the past, so that when we refresh, # the update is detected. sub write_old_file { @@ -96,6 +115,18 @@ write_old_file("sorting.mdwn", '[[!trailitems pagenames="sorting/beginning sorting/middle sorting/end"]] ' . '[[!inline pages="sorting/old or sorting/ancient or sorting/new" trail="yes"]] ' . '[[!traillink linked2]]'); +write_old_file("limited/a.mdwn", "a"); +write_old_file("limited/b.mdwn", "b"); +write_old_file("limited/c.mdwn", "c"); +write_old_file("limited/d.mdwn", "d"); +write_old_file("limited.mdwn", + '[[!inline pages="limited/*" trail="yes" show=2 sort=title]]'); +write_old_file("untrail/a.mdwn", "a"); +write_old_file("untrail/b.mdwn", "b"); +write_old_file("untrail.mdwn", "[[!traillink a]] [[!traillink b]]"); +write_old_file("retitled/a.mdwn", "a"); +write_old_file("retitled.mdwn", + '[[!meta title="the old title"]][[!traillink a]]'); write_old_file("meme.mdwn", <badger<\/a>/m); @@ -178,6 +204,24 @@ check_trail("sorting/old.html", "n=sorting/ancient p=sorting/new"); check_trail("sorting/ancient.html", "n=sorting/linked2 p=sorting/old"); check_trail("sorting/linked2.html", "n= p=sorting/ancient"); +# If the inline has a limited number of pages, the trail still contains +# everything. +$blob = readfile("t/tmp/out/limited.html"); +ok($blob =~ /a<\/a>/m); +ok($blob =~ /b<\/a>/m); +ok($blob !~ //m); +ok($blob !~ //m); +check_trail("limited/a.html", "n=limited/b p="); +check_trail("limited/b.html", "n=limited/c p=limited/a"); +check_trail("limited/c.html", "n=limited/d p=limited/b"); +check_trail("limited/d.html", "n= p=limited/c"); + +check_trail("untrail/a.html", "n=untrail/b p="); +check_trail("untrail/b.html", "n= p=untrail/a"); + +$blob = readfile("t/tmp/out/retitled/a.html"); +ok($blob =~ /\^ the old title \^/m); + # Make some changes and refresh. These writefile calls don't set an # old mtime, so they're strictly newer than the "old" files. @@ -192,7 +236,17 @@ writefile("sorting.mdwn", "t/tmp/in", readfile("t/tmp/in/sorting.mdwn") . '[[!trailoptions sort="title" reverse="yes"]]'); -ok(! system("$command -refresh")); +writefile("retitled.mdwn", "t/tmp/in", + '[[!meta title="the new title"]][[!traillink a]]'); + +# If the inline has a limited number of pages, the trail still depends on +# everything. +writefile("limited.html", "t/tmp/out", "[this gets rebuilt]"); +writefile("limited/c.mdwn", "t/tmp/in", '[[!meta title="New C page"]]c'); + +writefile("untrail.mdwn", "t/tmp/in", "no longer a trail"); + +ok(! system(@command, "--refresh")); check_trail("add/a.html", "n=add/b p="); check_trail("add/b.html", "n=add/c p=add/a"); @@ -218,4 +272,37 @@ check_trail("sorting/a/b.html", "n=sorting/ancient p=sorting/beginning"); check_trail("sorting/ancient.html", "n=sorting/z/a p=sorting/a/b"); check_trail("sorting/z/a.html", "n= p=sorting/ancient"); +# If the inline has a limited number of pages, the trail still depends on +# everything, so it gets rebuilt even though it doesn't strictly need it. +# This means we could use it as a way to recompute the order of members +# and the contents of their trail navbars, allowing us to fix the regression +# described in [[bugs/trail excess dependencies]] without a full content +# dependency. +$blob = readfile("t/tmp/out/limited.html"); +ok($blob =~ /a<\/a>/m); +ok($blob =~ /b<\/a>/m); +ok($blob !~ //m); +ok($blob !~ //m); +check_trail("limited/a.html", "n=limited/b p="); +check_trail("limited/b.html", "n=limited/c p=limited/a"); +check_trail("limited/c.html", "n=limited/d p=limited/b"); +check_trail("limited/d.html", "n= p=limited/c"); +# Also, b and d should pick up the change to c. This regressed with the +# change to using a presence dependency. +$blob = readfile("t/tmp/out/limited/b.html"); +ok($blob =~ /New C page >/m); +$blob = readfile("t/tmp/out/limited/d.html"); +ok($blob =~ /< New C page/m); + +# Members of a retitled trail should pick up that change. +# This regressed with the change to using a presence dependency. +$blob = readfile("t/tmp/out/retitled/a.html"); +ok($blob =~ /\^ the new title \^/m); + +# untrail is no longer a trail, so these are no longer in it. +check_no_trail("untrail/a.html"); +check_no_trail("untrail/b.html"); + ok(! system("rm -rf t/tmp")); + +done_testing();