aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-02-23 14:13:53 -0400
committerJoey Hess <joey@kitenet.net>2014-02-23 14:13:53 -0400
commit204dcda88bc595d1ad301a08ae25ebe4bd2afb8a (patch)
tree8f614e87bc179fe3cdd9dca9dc26d83114840041 /t
parente0d1c264d9f21b02761f0bc86948ec0169927beb (diff)
parentd52774dd458059ba1442fdac1daf648dc4f228de (diff)
downloadikiwiki-204dcda88bc595d1ad301a08ae25ebe4bd2afb8a.tar
ikiwiki-204dcda88bc595d1ad301a08ae25ebe4bd2afb8a.tar.gz
Merge remote-tracking branch 'intrigeri/fix_diffurl_vs._cgit'
Diffstat (limited to 't')
-rwxr-xr-xt/git.t25
1 files changed, 24 insertions, 1 deletions
diff --git a/t/git.t b/t/git.t
index 6d847dfb0..0396ae065 100755
--- a/t/git.t
+++ b/t/git.t
@@ -16,13 +16,14 @@ BEGIN {
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();
@@ -94,4 +95,26 @@ 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}
+);
+
system "rm -rf $dir";