update

[ikiwiki.git] / t / git.t

diff --git a/t/git.t b/t/git.t
index a3e5b36decd782a929bba4d10206c57c462afb40..0a5ba7266a74f7f55bf28b8839e897ae5f1e99f4 100755 (executable)
--- a/t/git.t
+++ b/t/git.t
@@ -15,7 +15,7 @@ BEGIN {
                }
        }
 }
-use Test::More tests => 11;
+use Test::More tests => 16;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -24,17 +24,17 @@ $config{rcs} = "git";
 $config{srcdir} = "$dir/src";
 IkiWiki::checkconfig();
 
-system "cd $gitrepo && git init-db 2>/dev/null";
-system "cd $gitrepo && echo dummy >dummy; git add . 2>/dev/null";
-system "cd $gitrepo && git commit -m Initial 2>/dev/null";
-system "git clone -l -s $gitrepo $config{srcdir} 2>/dev/null";
+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";
 
 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"}, undef); # no diff for first commit
+is($changes[0]{pages}[0]{"page"}, "dummy");
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");
@@ -53,9 +53,9 @@ my $message = "Added the second page";
 
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
-system "cd $config{srcdir}; git add test2.mdwn 2>/dev/null";
-system "cd $config{srcdir}; git commit -m \"$message\" test2.mdwn 2>/dev/null";
-system "cd $config{srcdir}; git push origin 2>/dev/null";
+system "cd $config{srcdir}; git add test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir}; git commit -m \"$message\" test2.mdwn >/dev/null 2>&1";
+system "cd $config{srcdir}; git push origin >/dev/null 2>&1";
 
 @changes = IkiWiki::rcs_recentchanges(3);
 
@@ -65,4 +65,28 @@ is($changes[0]{pages}[0]{"page"}, "test2.mdwn");
 
 is($changes[1]{pages}[0]{"page"}, "test1.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");
+
+@changes = IkiWiki::rcs_recentchanges(4);
+
+is($#changes, 3);
+is($changes[0]{pages}[0]{"page"}, "test4.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");
+
+@changes = IkiWiki::rcs_recentchanges(4);
+
+is($#changes, 3);
+is($changes[0]{pages}[0]{"page"}, "newdir/test5.mdwn");
+
+IkiWiki::rcs_remove("newdir/test5.mdwn");
+IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
+
 system "rm -rf $dir";