X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/722953ac25a55949e974a454280e5f60c68fc33b..d84b3fd1e75923918e15967e582f29dbb278d0a0:/t/cvs.t
diff --git a/t/cvs.t b/t/cvs.t
index f29e58a6a..9afd5a7e9 100755
--- a/t/cvs.t
+++ b/t/cvs.t
@@ -1,7 +1,7 @@
#!/usr/bin/perl
use warnings;
use strict;
-use Test::More; my $total_tests = 37;
+use Test::More; my $total_tests = 42;
use IkiWiki;
my $default_test_methods = '^test_*';
@@ -154,22 +154,20 @@ sub test_rcs_commit_staged {
}
sub test_rcs_add {
- my $message = "add a top-level ASCII (non-UTF-8) page via VCS API";
- writefile('test0.mdwn', $config{srcdir}, "* some plain ASCII text");
- IkiWiki::rcs_add("test0.mdwn");
- IkiWiki::rcs_commit(
- file => "test0.mdwn",
- message => $message,
- token => "moo",
- );
- is_newly_added("test0.mdwn");
-# is_in_keyword_substitution_mode("test0.mdwn", undef);
my @changes = IkiWiki::rcs_recentchanges(3);
+ is_total_number_of_changes(\@changes, 0);
+
+ my $message = "add a top-level ASCII (non-UTF-8) page via VCS API";
+ my $file = q{test0.mdwn};
+ add_and_commit($file, $message, q{* some plain ASCII text});
+ is_newly_added($file);
+ is_in_keyword_substitution_mode($file, undef);
+ @changes = IkiWiki::rcs_recentchanges(3);
is_total_number_of_changes(\@changes, 1);
- is_most_recent_change(\@changes, "test0", $message);
+ is_most_recent_change(\@changes, stripext($file), $message);
$message = "add a top-level dir via VCS API";
- my $dir1 = "test3";
+ my $dir1 = q{test3};
can_mkdir($dir1);
IkiWiki::rcs_add($dir1);
# XXX test that the wrapper hangs here without our genwrapper()
@@ -185,25 +183,18 @@ sub test_rcs_add {
is_total_number_of_changes(\@changes, 1); # dirs aren't tracked
$message = "add a non-ASCII (UTF-8) text file in an un-added dir";
- my $dir2 = "test4/test5";
- can_mkdir($_) for ('test4', $dir2);
- writefile("$dir2/test1.mdwn", $config{srcdir},readfile("t/test1.mdwn"));
- IkiWiki::rcs_add("$dir2/test1.mdwn");
- IkiWiki::rcs_commit(
- file => "$dir2/test1.mdwn",
- message => $message,
- token => "omo",
- );
- is_newly_added("$dir2/test1.mdwn");
-# is_in_keyword_substitution_mode("$dir2/test1.mdwn", undef);
+ can_mkdir($_) for (qw(test4 test4/test5));
+ $file = q{test4/test5/test1.mdwn};
+ add_and_commit($file, $message, readfile("t/test1.mdwn"));
+ is_newly_added($file);
+ is_in_keyword_substitution_mode($file, undef);
@changes = IkiWiki::rcs_recentchanges(3);
is_total_number_of_changes(\@changes, 2);
- is_most_recent_change(\@changes, "$dir2/test1", $message);
+ is_most_recent_change(\@changes, stripext($file), $message);
$message = "add a binary file in an un-added dir, and commit_staged";
- my $dir3 = "test6";
- my $file = "$dir3/test7.ico";
- can_mkdir($dir3);
+ can_mkdir(q{test6});
+ $file = q{test6/test7.ico};
my $bindata_in = readfile("doc/favicon.ico", 1);
my $bindata_out = sub { readfile($config{srcdir} . "/$file", 1) };
writefile($file, $config{srcdir}, $bindata_in, 1);
@@ -233,7 +224,7 @@ sub test_rcs_add {
IkiWiki::rcs_add($_) for ($file1, $file2);
IkiWiki::rcs_commit_staged(message => $message);
is_newly_added($_) for ($file1, $file2);
-# is_in_keyword_substitution_mode($file1, undef);
+ is_in_keyword_substitution_mode($file1, undef);
is_in_keyword_substitution_mode($file2, '-kb');
@changes = IkiWiki::rcs_recentchanges(3);
is_total_number_of_changes(\@changes, 3);
@@ -278,29 +269,20 @@ sub test_rcs_rename {
}
sub test_rcs_recentchanges {
+ my @changes = IkiWiki::rcs_recentchanges(3);
+ is_total_number_of_changes(\@changes, 0);
+
my $message = "Add a page via CVS directly";
- writefile('test2.mdwn', $config{srcdir}, readfile("t/test2.mdwn"));
+ my $file = q{test2.mdwn};
+ writefile($file, $config{srcdir}, readfile(q{t/test2.mdwn}));
system "cd $config{srcdir}"
- . " && cvs add test2.mdwn >/dev/null 2>&1";
+ . " && cvs add $file >/dev/null 2>&1";
system "cd $config{srcdir}"
- . " && cvs commit -m \"$message\" test2.mdwn >/dev/null";
+ . " && cvs commit -m \"$message\" $file >/dev/null";
- my @changes = IkiWiki::rcs_recentchanges(3);
- is(
- $#changes,
- 0,
- q{total commits: 1},
- );
- is(
- $changes[0]{message}[0]{"line"},
- $message,
- q{most recent commit's first message line matches},
- );
- is(
- $changes[0]{pages}[0]{"page"},
- "test2",
- q{most recent commit's first pagename matches},
- );
+ @changes = IkiWiki::rcs_recentchanges(3);
+ is_total_number_of_changes(\@changes, 1);
+ is_most_recent_change(\@changes, stripext($file), $message);
# CVS commits run ikiwiki once for every committed file (!)
# - commit_prep alone should fix this
@@ -342,7 +324,10 @@ sub test_rcs_getmtime {
}
sub test_rcs_receive {
- pass(q{rcs_receive doesn't make sense for CVS});
+ my $description = q{rcs_receive doesn't make sense for CVS};
+ exists $IkiWiki::hooks{rcs}{rcs_receive}
+ ? fail($description)
+ : pass($description);
}
sub test_rcs_preprevert {
@@ -353,6 +338,11 @@ sub test_rcs_preprevert {
}
sub test_rcs_revert {
+ # test rcs_recentchanges() real darn well
+ # extract read-backwards patchset parser from rcs_recentchanges()
+ # recentchanges: given max, return list of changeset/files/etc.
+ # revert: given changeset ID, return list of file/rev/action
+ #
# can it assume we're under CVS control? or must it check?
# given a patchset number, stage the revert for rcs_commit_staged()
# if commit succeeds, return undef
@@ -480,6 +470,17 @@ sub _generate_test_repo {
system "$cvs co -d $config{srcdir} $config{cvspath} $dn";
}
+sub add_and_commit {
+ my ($file, $message, $contents) = @_;
+ writefile($file, $config{srcdir}, $contents);
+ IkiWiki::rcs_add($file);
+ IkiWiki::rcs_commit(
+ file => $file,
+ message => $message,
+ token => "moo",
+ );
+}
+
sub can_mkdir {
my $dir = shift;
ok(
@@ -499,6 +500,7 @@ sub is_newly_added {
sub is_in_keyword_substitution_mode {
my ($file, $mode) = @_;
+ $mode = '(none)' unless defined $mode;
is(
IkiWiki::Plugin::cvs::cvs_info("Sticky Options", $file),
$mode,
@@ -528,3 +530,10 @@ sub is_most_recent_change {
q{most recent commit's first pagename matches},
);
}
+
+sub stripext {
+ my ($file, $extension) = @_;
+ $extension = '\..+?' unless defined $extension;
+ $file =~ s|$extension$||g;
+ return $file;
+}