X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ffb27000431f744f2cec9d198d0a0d8cbb0bd405..63fe022602b622eb80bd38d64ee272b543ce0418:/t/svn.t?ds=inline

diff --git a/t/svn.t b/t/svn.t
index 69ad5c29c..5223b4409 100755
--- a/t/svn.t
+++ b/t/svn.t
@@ -14,7 +14,7 @@ BEGIN {
 		}
 	}
 }
-use Test::More tests => 8;
+use Test::More tests => 12;
 
 BEGIN { use_ok("IkiWiki"); }
 
@@ -23,11 +23,14 @@ $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");
@@ -40,7 +43,7 @@ my @changes;
 
 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";
@@ -51,11 +54,18 @@ system "svn add $config{srcdir}/test2.mdwn >/dev/null";
 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[0]{pages}[0]{"page"}, "test2");
+is($changes[1]{pages}[0]{"page"}, "test1");
 
-is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
+# extra slashes in the path shouldn't break things
+$config{svnpath} = "/trunk//";
+IkiWiki::checkconfig();
+@changes = IkiWiki::rcs_recentchanges(3);
+is($#changes, 1);
+is($changes[0]{message}[0]{"line"}, $message);
+is($changes[0]{pages}[0]{"page"}, "test2");
+is($changes[1]{pages}[0]{"page"}, "test1");
 
 system "rm -rf $dir";