X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/633f8d4dd3f21e5793f4aa8f5b9ca91156a64034..ba2b9139396abe573db43ee65e0b3ae3338aab88:/t/git.t?ds=inline diff --git a/t/git.t b/t/git.t index f4e27c473..b3aa6a80b 100755 --- a/t/git.t +++ b/t/git.t @@ -15,13 +15,14 @@ BEGIN { } } } -use Test::More tests => 11; +use Test::More tests => 16; BEGIN { use_ok("IkiWiki"); } %config=IkiWiki::defaultconfig(); $config{rcs} = "git"; $config{srcdir} = "$dir/src"; +IkiWiki::loadplugins(); IkiWiki::checkconfig(); system "cd $gitrepo && git init >/dev/null 2>&1"; @@ -46,7 +47,7 @@ IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo"); is($#changes, 1); 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"); # Manual commit my $message = "Added the second page"; @@ -61,8 +62,32 @@ system "cd $config{srcdir}; git push origin >/dev/null 2>&1"; is($#changes, 2); is($changes[0]{message}[0]{"line"}, $message); -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"); + +# 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"); + +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("newdir/test5.mdwn"); +IkiWiki::rcs_commit_staged("Remove the 5th page", "moo", "Joe User"); system "rm -rf $dir";