clarify

[git.ikiwiki.info.git] / t / git.t

diff --git a/t/git.t b/t/git.t
index f1c24b3598e1709d9d58a9f962df4fef1f12a3f1..71195fdfae5df5092fe5716c64bd1c1546e0c337 100755 (executable)
--- a/t/git.t
+++ b/t/git.t
@@ -7,24 +7,36 @@ BEGIN {
        $dir="/tmp/ikiwiki-test-git.$$";
        my $git=`which git`;
        chomp $git;
        $dir="/tmp/ikiwiki-test-git.$$";
        my $git=`which git`;
        chomp $git;

-       if (! -x $git || ! mkdir($dir)) {
+       if (! -x $git) {

                eval q{
                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 => 26;

 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "git";
 $config{srcdir} = "$dir/src";
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "git";
 $config{srcdir} = "$dir/src";

+$config{diffurl} = '/nonexistent/cgit/plain/[[file]]';

 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
 IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 

+my $makerepo;
+if ($ENV{INSTALLED_TESTS}) {
+       $makerepo = "ikiwiki-makerepo";
+}
+else {
+       $makerepo = "./ikiwiki-makerepo";
+}
+

 ok (mkdir($config{srcdir}));
 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);
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);


@@ -38,7 +50,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");
 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);
 
 
 @changes = IkiWiki::rcs_recentchanges(3);
 


@@ -68,7 +84,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");
 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);
 
 
 @changes = IkiWiki::rcs_recentchanges(4);
 


@@ -77,7 +93,7 @@ is($changes[0]{pages}[0]{"page"}, "test4");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");
 
 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);
 
 
 @changes = IkiWiki::rcs_recentchanges(4);
 


@@ -85,6 +101,45 @@ is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "newdir/test5");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 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}
+);
+
+# 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";
 
 system "rm -rf $dir";