X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=t%2Fsvn.t;h=82b71b5fc1a404fc81159b6585c47997e9a4eb10;hb=8f266d4d436be5cbb765ac81424687e764397d05;hp=eba8c65ef1d025b224ed7d8952fb71ae48754857;hpb=f1228946bd62b7b4528bccabe91f836a16912e28;p=ikiwiki.git diff --git a/t/svn.t b/t/svn.t index eba8c65ef..82b71b5fc 100755 --- a/t/svn.t +++ b/t/svn.t @@ -23,6 +23,7 @@ $config{rcs} = "svn"; $config{srcdir} = "$dir/src"; $config{svnrepo} = "$dir/repo"; $config{svnpath} = "trunk"; +IkiWiki::loadplugins(); IkiWiki::checkconfig(); my $svnrepo = "$dir/repo"; @@ -35,14 +36,18 @@ system "svn co file://$svnrepo/trunk $config{srcdir} >/dev/null"; 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"); +IkiWiki::rcs_commit( + file => "test1.mdwn", + message => "Added the first page", + token => "moo", +); 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"); # Manual commit my $message = "Added the second page"; @@ -55,8 +60,8 @@ system "svn commit $config{srcdir}/test2.mdwn -m \"$message\" >/dev/null"; @changes = IkiWiki::rcs_recentchanges(3); is($#changes, 1); is($changes[0]{message}[0]{"line"}, $message); -is($changes[0]{pages}[0]{"page"}, "test2.mdwn"); -is($changes[1]{pages}[0]{"page"}, "test1.mdwn"); +is($changes[0]{pages}[0]{"page"}, "test2"); +is($changes[1]{pages}[0]{"page"}, "test1"); # extra slashes in the path shouldn't break things $config{svnpath} = "/trunk//"; @@ -64,7 +69,7 @@ IkiWiki::checkconfig(); @changes = IkiWiki::rcs_recentchanges(3); is($#changes, 1); is($changes[0]{message}[0]{"line"}, $message); -is($changes[0]{pages}[0]{"page"}, "test2.mdwn"); -is($changes[1]{pages}[0]{"page"}, "test1.mdwn"); +is($changes[0]{pages}[0]{"page"}, "test2"); +is($changes[1]{pages}[0]{"page"}, "test1"); system "rm -rf $dir";