summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-02-09 14:11:06 -0400
committerJoey Hess <joey@kitenet.net>2011-02-09 14:11:06 -0400
commit8e8311718a0ca4d52aa86a9c8cc439430b11a468 (patch)
tree8e97a256cad901d15070e5c8df2e65dd1e21da3d /t
parentb522d8cddaa27d20eefbab762a33a3676ba0985c (diff)
parent40f85e5c91c86a55661f68a5e9e38cc2c2a1e1be (diff)
Merge remote branch 'smcv/ready/transient-tag'
Conflicts: t/tag.t
Diffstat (limited to 't')
-rwxr-xr-xt/tag.t10
1 files changed, 6 insertions, 4 deletions
diff --git a/t/tag.t b/t/tag.t
index 2d0a6e662..9f2a8f3ec 100755
--- a/t/tag.t
+++ b/t/tag.t
@@ -3,7 +3,7 @@ package IkiWiki;
use warnings;
use strict;
-use Test::More tests => 22;
+use Test::More tests => 23;
BEGIN { use_ok("IkiWiki"); }
BEGIN { use_ok("IkiWiki::Render"); }
@@ -22,6 +22,7 @@ $config{wiki_file_chars} = "-[:alnum:]+/.:_";
$config{userdir} = "users";
$config{tagbase} = "tags";
$config{tag_autocreate} = 1;
+$config{tag_autocreate_commit} = 0;
$config{default_pageext} = "mdwn";
$config{wiki_file_prune_regexps} = [qr/^\./];
$config{underlaydirbase} = '.';
@@ -63,9 +64,10 @@ is_deeply([sort keys %autofiles], [qw(tags/lucky.mdwn tags/numbers.mdwn tags/pri
ok(!-e "t/tmp/tags/lucky.mdwn");
my (%pages, @del);
IkiWiki::gen_autofile("tags/lucky.mdwn", \%pages, \@del);
-is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
-is_deeply(\@del, []);
-ok(-s "t/tmp/tags/lucky.mdwn");
+ok(! -s "t/tmp/tags/lucky.mdwn");
+ok(-s "t/tmp/.ikiwiki/transient/tags/lucky.mdwn");
+is_deeply(\%pages, {"t/tmp/tags/lucky" => 1}) || diag explain \%pages;
+is_deeply(\@del, []) || diag explain \@del;
# generating an autofile that already exists does nothing
%pages = @del = ();