X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4558457402a4ab6bc795589a2e400fa66144f76e..e1a0b25be1996979571751756abfbcddc06231bc:/t/git.t diff --git a/t/git.t b/t/git.t index f1c24b359..0396ae065 100755 --- a/t/git.t +++ b/t/git.t @@ -7,19 +7,23 @@ BEGIN { $dir="/tmp/ikiwiki-test-git.$$"; my $git=`which git`; chomp $git; - if (! -x $git || ! mkdir($dir)) { + if (! -x $git) { eval q{ - use Test::More skip_all => "git not available or could not make test dir" + use Test::More skip_all => "git not available" } } + if (! mkdir($dir)) { + die $@; + } } -use Test::More tests => 18; +use Test::More tests => 22; BEGIN { use_ok("IkiWiki"); } %config=IkiWiki::defaultconfig(); $config{rcs} = "git"; $config{srcdir} = "$dir/src"; +$config{diffurl} = '/nonexistent/cgit/plain/[[file]]'; IkiWiki::loadplugins(); IkiWiki::checkconfig(); @@ -38,7 +42,11 @@ is($changes[0]{pages}[0]{"page"}, ".gitignore"); my $test1 = readfile("t/test1.mdwn"); writefile('test1.mdwn', $config{srcdir}, $test1); IkiWiki::rcs_add("test1.mdwn"); -IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo"); +IkiWiki::rcs_commit( + file => "test1.mdwn", + message => "Added the first page", + token => "moo", +); @changes = IkiWiki::rcs_recentchanges(3); @@ -68,7 +76,7 @@ is($changes[1]{pages}[0]{"page"}, "test1"); writefile('test3.mdwn', $config{srcdir}, $test1); IkiWiki::rcs_add("test3.mdwn"); IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn"); -IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User"); +IkiWiki::rcs_commit_staged(message => "Added the 4th page"); @changes = IkiWiki::rcs_recentchanges(4); @@ -77,7 +85,7 @@ is($changes[0]{pages}[0]{"page"}, "test4"); ok(mkdir($config{srcdir}."/newdir")); IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn"); -IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User"); +IkiWiki::rcs_commit_staged(message => "Added the 5th page"); @changes = IkiWiki::rcs_recentchanges(4); @@ -85,6 +93,28 @@ is($#changes, 3); is($changes[0]{pages}[0]{"page"}, "newdir/test5"); IkiWiki::rcs_remove("newdir/test5.mdwn"); -IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User"); +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} +); system "rm -rf $dir";