From ef1f4defed94a2cd4e301d9aa355af3a1435c381 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Jul 2008 15:08:17 -0400 Subject: [PATCH] bring git test to parity with bazaar test Also, fixed bug I introduced in bazaar test. --- t/bazaar.t | 2 +- t/git.t | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/t/bazaar.t b/t/bazaar.t index 675a143b5..fcdc3d4de 100755 --- a/t/bazaar.t +++ b/t/bazaar.t @@ -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 f4e27c473..0a5ba7266 100755 --- 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"; -- 2.26.2