correct a typo

[git.ikiwiki.info.git] / t / svn.t

diff --git a/t/svn.t b/t/svn.t
index 69ad5c29c18d389d079d1a174cabae246a4858c1..8a8282c73340b8f8095204f24031a3a7a14534c0 100755 (executable)
--- a/t/svn.t
+++ b/t/svn.t
@@ -14,20 +14,21 @@ BEGIN {
                }
        }
 }
                }
        }
 }

-use Test::More tests => 8;
+use Test::More tests => 12;

 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "svn";
 $config{srcdir} = "$dir/src";
 
 BEGIN { use_ok("IkiWiki"); }
 
 %config=IkiWiki::defaultconfig();
 $config{rcs} = "svn";
 $config{srcdir} = "$dir/src";

-$config{svnrepo} = "$dir/repo";

 $config{svnpath} = "trunk";
 IkiWiki::checkconfig();
 
 $config{svnpath} = "trunk";
 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");
 
 # Web commit
 my $test1 = readfile("t/test1.mdwn");


@@ -51,11 +52,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);
 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);
 is($changes[0]{message}[0]{"line"}, $message);
 is($changes[0]{pages}[0]{"page"}, "test2.mdwn");

+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.mdwn");

 is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
 
 system "rm -rf $dir";
 is($changes[1]{pages}[0]{"page"}, "test1.mdwn");
 
 system "rm -rf $dir";