X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7538d356c8e7cd715c0a7109f84881487f853cfc..e779098796e18c11c43e9e38339577376ded8e2b:/t/bazaar.t?ds=sidebyside

diff --git a/t/bazaar.t b/t/bazaar.t
index b182d1d32..0bdd883d5 100755
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -12,13 +12,14 @@ BEGIN {
 		}
 	}
 }
-use Test::More tests => 13;
+use Test::More tests => 17;
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "bzr";
 $config{srcdir} = "$dir/repo";
+IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
 system "bzr init $config{srcdir}";
@@ -34,7 +35,7 @@ my @changes;
 
 is($#changes, 0);
 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");
 is($changes[0]{user}, "Joe User");
 	
 # Manual commit
@@ -44,7 +45,7 @@ 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 add --quiet $config{srcdir}/test2.mdwn";
 system "bzr commit --quiet --author \"$user\" -m \"$message\" $config{srcdir}";
 	
 @changes = IkiWiki::rcs_recentchanges(3);
@@ -52,13 +53,16 @@ system "bzr commit --quiet --author \"$user\" -m \"$message\" $config{srcdir}";
 is($#changes, 1);
 is($changes[0]{message}[0]{"line"}, $message);
 is($changes[0]{user}, $username);
-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");
 
 my $ctime = IkiWiki::rcs_getctime("test2.mdwn");
 ok($ctime >= time() - 20);
 
+my $mtime = IkiWiki::rcs_getmtime("test2.mdwn");
+ok($mtime >= time() - 20);
+
 writefile('test3.mdwn', $config{srcdir}, $test1);
 IkiWiki::rcs_add("test3.mdwn");
 IkiWiki::rcs_rename("test3.mdwn", "test4.mdwn");
@@ -67,9 +71,18 @@ 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");
+is($changes[0]{pages}[0]{"page"}, "test4");
+
+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");
 
-IkiWiki::rcs_remove("test4.mdwn");
-IkiWiki::rcs_commit_staged("Remove the 4th page", "moo", "Joe User");
+IkiWiki::rcs_remove("newdir/test5.mdwn");
+IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");
 
 system "rm -rf $dir";