X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=t%2Fbazaar.t;h=675a143b5baf89775f42d72b7ead3ef4e6dbcd96;hp=75534682b6532cdc27981652d65ab79d09c8280d;hb=12c5786df4e74c143f24398b8d0028000b61daba;hpb=cddc335b2bd98a302b261200c12d61b05476d727

diff --git a/t/bazaar.t b/t/bazaar.t
index 75534682b..675a143b5 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -12,12 +12,12 @@ BEGIN {
 		}
 	}
 }
-use Test::More tests => 11;
+use Test::More tests => 16;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
-$config{rcs} = "bazaar";
+$config{rcs} = "bzr";
 $config{srcdir} = "$dir/repo";
 IkiWiki::checkconfig();
 
@@ -44,8 +44,8 @@ my $message = "Added the second page";
 
 my $test2 = readfile("t/test2.mdwn");
 writefile('test2.mdwn', $config{srcdir}, $test2);
-system "bzr add $config{srcdir}/test2.mdwn";
-system "bzr commit --author \"$user\" -m \"$message\" $config{srcdir}";
+system "bzr add --quiet $config{srcdir}/test2.mdwn";
+system "bzr commit --quiet --author \"$user\" -m \"$message\" $config{srcdir}";
 	
 @changes = IkiWiki::rcs_recentchanges(3);
 
@@ -59,4 +59,26 @@ is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
 my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
 ok($ctime >= time() - 20);
 
+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, 2);
+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";