X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/67c6ff9b086d90b2dd777a722b26b05daa648479..f3820ee8acbbb31a4794039a989d3e642f5c6d2a:/t/mercurial.t diff --git a/t/mercurial.t b/t/mercurial.t index da4e2beaa..4918fc76e 100755 --- a/t/mercurial.t +++ b/t/mercurial.t @@ -6,11 +6,14 @@ BEGIN { $dir = "/tmp/ikiwiki-test-hg.$$"; my $hg=`which hg`; chomp $hg; - if (! -x $hg || ! mkdir($dir)) { + if (! -x $hg) { eval q{ - use Test::More skip_all => "hg not available or could not make test dir" + use Test::More skip_all => "hg not available" } } + if (! mkdir($dir)) { + die $@; + } } use Test::More tests => 11; @@ -19,22 +22,32 @@ BEGIN { use_ok("IkiWiki"); } %config=IkiWiki::defaultconfig(); $config{rcs} = "mercurial"; $config{srcdir} = "$dir/repo"; +IkiWiki::loadplugins(); IkiWiki::checkconfig(); +use CGI::Session; +my $session=CGI::Session->new; +$session->param("name", "Joe User"); + system "hg init $config{srcdir}"; # Web commit my $test1 = readfile("t/test1.mdwn"); writefile('test1.mdwn', $config{srcdir}, $test1); IkiWiki::rcs_add("test1.mdwn"); -IkiWiki::rcs_commit("test1.mdwn", "Added the first page", "moo", "Joe User"); +IkiWiki::rcs_commit( + file => "test1.mdwn", + message => "Added the first page", + token => "moo", + session => $session, +); my @changes; @changes = IkiWiki::rcs_recentchanges(3); 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 @@ -52,9 +65,9 @@ system "hg commit -R $config{srcdir} -u \"$user\" -m \"$message\" -d \"0 0\""; 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"); is($ctime, 0);