X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/729991564ec7e1116fc023c51e73b47af8b6fce7..a2bda4b6af44e01db5f4761926318c94974cb45c:/t/comments.t?ds=sidebyside diff --git a/t/comments.t b/t/comments.t index da2148b6b..fc87d72ff 100755 --- a/t/comments.t +++ b/t/comments.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; ok(! system("rm -rf t/tmp")); @@ -9,6 +10,20 @@ ok(mkdir "t/tmp"); ok(! system("cp -R t/tinyblog t/tmp/in")); ok(mkdir "t/tmp/in/post" or -d "t/tmp/in/post"); +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)); +} + my $comment; $comment = <<EOF; @@ -24,7 +39,7 @@ $comment = <<EOF; date="1969-02-12T07:00:00Z" content="I explored"]] EOF -writefile("post/comment_2._comment", "t/tmp/in", $comment); +writefile("post/comment_2_10a49d69282155c5c3e66dc58f64f956._comment", "t/tmp/in", $comment); $comment = <<EOF; [[!comment username="william" @@ -35,12 +50,11 @@ writefile("post/comment_1._comment", "t/tmp/in", $comment); # Give the files mtimes in the wrong order ok(utime(111111111, 111111111, "t/tmp/in/post/comment_3._comment")); -ok(utime(222222222, 222222222, "t/tmp/in/post/comment_2._comment")); +ok(utime(222222222, 222222222, "t/tmp/in/post/comment_2_10a49d69282155c5c3e66dc58f64f956._comment")); ok(utime(333333333, 333333333, "t/tmp/in/post/comment_1._comment")); # Build the wiki -ok(! system("make -s ikiwiki.out")); -ok(! system("perl -I. ./ikiwiki.out -verbose -plugin comments -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -set comments_pagespec='*' -templatedir=templates t/tmp/in t/tmp/out")); +ok(! system(@command, qw(--verbose --plugin comments --url=http://example.com --cgiurl=http://example.com/ikiwiki.cgi --rss --atom --set comments_pagespec=* t/tmp/in t/tmp/out))); # Check that the comments are in the right order @@ -54,4 +68,18 @@ sub slurp { my $content = slurp("t/tmp/out/post/index.html"); ok(defined $content); -ok($content =~ m/I conquered.*I explored.*I landed/s); +like($content, qr/I conquered.*I explored.*I landed/s); + +$content = slurp("t/tmp/out/post/index.atom"); +ok(defined $content); +like($content, qr{ + <link\s*href="http://example\.com/post/[#]comment-[[:xdigit:]]+" + .* + <link\s*href="http://example\.com/post/[#]comment-[[:xdigit:]]+" + .* + <link\s*href="http://example\.com/post/[#]comment-[[:xdigit:]]+" +}sx, 'Each comment gets an appropriate permalink in <link>'); +unlike($content, qr{<link\s*href=.*/post/comment_[123]/}); +unlike($content, qr{<link\s*href=.*/post/comment_[123]_[[:xdigit:]]+/}); + +done_testing();