X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3bfa109971637f4f813968f69f70921c23445dbe..219f057e5857c952289fcacd14cf0da91c5262b2:/t/svn.t?ds=inline

diff --git a/t/svn.t b/t/svn.t
index a1878a73d..cce8452a6 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -8,11 +8,14 @@ BEGIN {
 	chomp $svn;
 	my $svnadmin=`which svnadmin`;
 	chomp $svnadmin;
-	if (! -x $svn || ! -x $svnadmin || ! mkdir($dir)) {
+	if (! -x $svn || ! -x $svnadmin) {
 		eval q{
-			use Test::More skip_all => "svn not available or could not make test dir"
+			use Test::More skip_all => "svn or svnadmin not available"
 		}
 	}
+	if (! mkdir($dir)) {
+		die $@;
+	}
 }
 use Test::More tests => 12;
 
@@ -23,24 +26,31 @@ $config{rcs} = "svn";
 $config{srcdir} = "$dir/src";
 $config{svnrepo} = "$dir/repo";
 $config{svnpath} = "trunk";
+IkiWiki::loadplugins();
 IkiWiki::checkconfig();
 
-system "svnadmin create $config{svnrepo} >/dev/null";
-system "svn mkdir file://$config{svnrepo}/trunk -m add >/dev/null";
-system "svn co file://$config{svnrepo}/trunk $config{srcdir} >/dev/null";
+my $svnrepo = "$dir/repo";
+
+system "svnadmin create $svnrepo >/dev/null";
+system "svn mkdir file://$svnrepo/trunk -m add >/dev/null";
+system "svn co file://$svnrepo/trunk $config{srcdir} >/dev/null";
 
 # 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");
+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";
@@ -53,8 +63,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//";
@@ -62,7 +72,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";