]> sipb.mit.edu Git - ikiwiki.git/commitdiff
bring git test to parity with bazaar test
authorJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:08:17 +0000 (15:08 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Fri, 25 Jul 2008 19:08:17 +0000 (15:08 -0400)
Also, fixed bug I introduced in bazaar test.

t/bazaar.t
t/git.t

index 675a143b5baf89775f42d72b7ead3ef4e6dbcd96..fcdc3d4de8ee71577026d2f133875de7bb11b986 100755 (executable)
@@ -66,7 +66,7 @@ IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
 
 @changes = IkiWiki::rcs_recentchanges(4);
 
-is($#changes, 2);
+is($#changes, 3);
 is($changes[0]{pages}[0]{"page"}, "test4.mdwn");
 
 ok(mkdir($config{srcdir}."/newdir"));
diff --git a/t/git.t b/t/git.t
index f4e27c473c5279f6e5a389e000d74f66a5edf2be..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"); }
 
@@ -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";