Fix unusual --setup --post-commit command line option combo.

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

diff --git a/t/bazaar.t b/t/bazaar.t
index 675a143b5baf89775f42d72b7ead3ef4e6dbcd96..2ca44a65e084ce1395855ae177f4fa8632ba3e5c 100755 (executable)
--- a/t/bazaar.t
+++ b/t/bazaar.t
@@ -19,6 +19,7 @@ BEGIN { use_ok("IkiWiki"); }
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "bzr";
 $config{srcdir} = "$dir/repo";
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "bzr";
 $config{srcdir} = "$dir/repo";

+IkiWiki::loadplugins();

 IkiWiki::checkconfig();
 
 system "bzr init $config{srcdir}";
 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);
 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
 is($changes[0]{user}, "Joe User");
        
 # Manual commit


@@ -52,9 +53,9 @@ 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, 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 $ctime = IkiWiki::rcs_getctime("test2.mdwn");
 ok($ctime >= time() - 20);


@@ -67,7 +68,7 @@ IkiWiki::rcs_commit_staged("Added the 4th page", "moo", "Joe User");
 @changes = IkiWiki::rcs_recentchanges(4);
 
 is($#changes, 2);
 @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");
 
 ok(mkdir($config{srcdir}."/newdir"));
 IkiWiki::rcs_rename("test4.mdwn", "newdir/test5.mdwn");


@@ -76,7 +77,7 @@ IkiWiki::rcs_commit_staged("Added the 5th page", "moo", "Joe User");
 @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_commit_staged("Remove the 5th page", "moo", "Joe User");
 
 IkiWiki::rcs_remove("newdir/test5.mdwn");
 IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User");