inline: change default sort order from age to "age title" for determinism

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

diff --git a/t/git.t b/t/git.t
index 0a5ba7266a74f7f55bf28b8839e897ae5f1e99f4..0396ae0652a26b5be875ed9a6c733a81f6656117 100755 (executable)
--- a/t/git.t
+++ b/t/git.t
@@ -3,50 +3,56 @@ use warnings;
 use strict;
 
 my $dir;
 use strict;
 
 my $dir;

-my $gitrepo;

 BEGIN {
        $dir="/tmp/ikiwiki-test-git.$$";
 BEGIN {
        $dir="/tmp/ikiwiki-test-git.$$";

-       $gitrepo="$dir/repo";

        my $git=`which git`;
        chomp $git;
        my $git=`which git`;
        chomp $git;

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

                eval q{
                eval q{

-                       use Test::More skip_all => "git not available or could not make test dirs"
+                       use Test::More skip_all => "git not available"

                }
        }
                }
        }

+       if (! mkdir($dir)) {
+               die $@;
+       }

 }
 }

-use Test::More tests => 16;
+use Test::More tests => 22;

 
 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::checkconfig();
 

-system "cd $gitrepo && git init >/dev/null 2>&1";
-system "cd $gitrepo && echo dummy > dummy; git add . >/dev/null 2>&1";
-system "cd $gitrepo && git commit -m Initial >/dev/null 2>&1";
-system "git clone -l -s $gitrepo $config{srcdir} >/dev/null 2>&1";
+ok (mkdir($config{srcdir}));
+is (system("./ikiwiki-makerepo git $config{srcdir} $dir/repo"), 0);

 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0); # counts for dummy commit during repo creation
 
 my @changes;
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 0); # counts for dummy commit during repo creation

-is($changes[0]{message}[0]{"line"}, "Initial");
-is($changes[0]{pages}[0]{"page"}, "dummy");
+# ikiwiki-makerepo's first commit is setting up the .gitignore
+is($changes[0]{message}[0]{"line"}, "initial commit");
+is($changes[0]{pages}[0]{"page"}, ".gitignore");

 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
 writefile('test1.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test1.mdwn");
 
 # Web commit
 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);
 
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, "Added the first page");
 
 @changes = IkiWiki::rcs_recentchanges(3);
 
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, "Added the first page");

-is($changes[0]{pages}[0]{"page"}, "test1.mdwn");
+is($changes[0]{pages}[0]{"page"}, "test1");

        
 # Manual commit
 my $message = "Added the second page";
        
 # Manual commit
 my $message = "Added the second page";


@@ -61,32 +67,54 @@ system "cd $config{srcdir}; git push origin >/dev/null 2>&1";
 
 is($#changes, 2);
 is($changes[0]{message}[0]{"line"}, $message);
 
 is($#changes, 2);
 is($changes[0]{message}[0]{"line"}, $message);

-is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
+is($changes[0]{pages}[0]{"page"}, "test2");

 
 

-is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
+is($changes[1]{pages}[0]{"page"}, "test1");

 
 # Renaming
 
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
 
 # Renaming
 
 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);
 
 is($#changes, 3);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
 is($#changes, 3);

-is($changes[0]{pages}[0]{"page"}, "test4.mdwn");
+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);
 
 is($#changes, 3);
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
 is($#changes, 3);

-is($changes[0]{pages}[0]{"page"}, "newdir/test5.mdwn");
+is($changes[0]{pages}[0]{"page"}, "newdir/test5");

 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 
 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";
 
 system "rm -rf $dir";