X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1786b106a9c7f448136ff47d9b6dd26d48a5dd2e..851d556d5b448d899599b8e63d259456c76ca1bd:/t/git.t diff --git a/t/git.t b/t/git.t index 6d847dfb0..71195fdfa 100755 --- a/t/git.t +++ b/t/git.t @@ -16,18 +16,27 @@ BEGIN { die $@; } } -use Test::More tests => 18; +use Test::More tests => 26; BEGIN { use_ok("IkiWiki"); } %config=IkiWiki::defaultconfig(); $config{rcs} = "git"; $config{srcdir} = "$dir/src"; +$config{diffurl} = '/nonexistent/cgit/plain/[[file]]'; IkiWiki::loadplugins(); IkiWiki::checkconfig(); +my $makerepo; +if ($ENV{INSTALLED_TESTS}) { + $makerepo = "ikiwiki-makerepo"; +} +else { + $makerepo = "./ikiwiki-makerepo"; +} + ok (mkdir($config{srcdir})); -is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0); +is (system("$makerepo git $config{srcdir} $dir/repo"), 0); my @changes; @changes = IkiWiki::rcs_recentchanges(3); @@ -94,4 +103,43 @@ is($changes[0]{pages}[0]{"page"}, "newdir/test5"); IkiWiki::rcs_remove("newdir/test5.mdwn"); IkiWiki::rcs_commit_staged(message => "Remove the 5th page"); +# diffurl escaping +ok(mkdir($config{srcdir}."/diffurl_dir")); +my $test3 = readfile("t/test1.mdwn"); +writefile('test3.mdwn', $config{srcdir}."/diffurl_dir", $test3); +IkiWiki::rcs_add("diffurl_dir/test3.mdwn"); +IkiWiki::rcs_commit( + file => "diffurl_dir/test3.mdwn", + message => "Added a page in diffurl_dir", + token => "moo", +); + +@changes = IkiWiki::rcs_recentchanges(5); + +is($#changes, 4); +is($changes[0]{pages}[0]{"page"}, "diffurl_dir/test3"); + +unlike( + $changes[0]{pages}[0]{"diffurl"}, + qr{%2F}m, + q{path separators are preserved when UTF-8scaping filename} +); + +# do a clean checkout to verify that "empty ident not allowed" is avoided +ok(! system("rm", "-rf", $config{srcdir})); +ok(! system("git", "clone", "$dir/repo", $config{srcdir})); + +writefile('unconfigured_author.mdwn', $config{srcdir}, 'I am an unconfigured git author'); +IkiWiki::rcs_add("unconfigured_author.mdwn"); +IkiWiki::rcs_commit( + file => "unconfigured_author.mdwn", + message => "hello, world", + token => "moo", +); + +@changes = IkiWiki::rcs_recentchanges(6); + +is($#changes, 5); +is($changes[0]{pages}[0]{"page"}, "unconfigured_author"); + system "rm -rf $dir";