Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[git.ikiwiki.info.git]
/
t
/
svn.t
diff --git
a/t/svn.t
b/t/svn.t
index 8a8282c73340b8f8095204f24031a3a7a14534c0..cce8452a66107dfb89c301200c22035087bf77de 100755
(executable)
--- a/
t/svn.t
+++ b/
t/svn.t
@@
-8,11
+8,14
@@
BEGIN {
chomp $svn;
my $svnadmin=`which svnadmin`;
chomp $svnadmin;
chomp $svn;
my $svnadmin=`which svnadmin`;
chomp $svnadmin;
- if (! -x $svn || ! -x $svnadmin
|| ! mkdir($dir)
) {
+ if (! -x $svn || ! -x $svnadmin) {
eval q{
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;
}
use Test::More tests => 12;
@@
-21,7
+24,9
@@
BEGIN { use_ok("IkiWiki"); }
%config=IkiWiki::defaultconfig();
$config{rcs} = "svn";
$config{srcdir} = "$dir/src";
%config=IkiWiki::defaultconfig();
$config{rcs} = "svn";
$config{srcdir} = "$dir/src";
+$config{svnrepo} = "$dir/repo";
$config{svnpath} = "trunk";
$config{svnpath} = "trunk";
+IkiWiki::loadplugins();
IkiWiki::checkconfig();
my $svnrepo = "$dir/repo";
IkiWiki::checkconfig();
my $svnrepo = "$dir/repo";
@@
-34,14
+39,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");
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");
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";
# Manual commit
my $message = "Added the second page";
@@
-54,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);
@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//";
# extra slashes in the path shouldn't break things
$config{svnpath} = "/trunk//";
@@
-63,7
+72,7
@@
IkiWiki::checkconfig();
@changes = IkiWiki::rcs_recentchanges(3);
is($#changes, 1);
is($changes[0]{message}[0]{"line"}, $message);
@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";
system "rm -rf $dir";