From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Feb 2011 17:47:39 +0000 (-0400)
Subject: Merge remote branch 'smcv/ready/tag-test'
X-Git-Tag: 3.20110225~82
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/db9f2b1b2b97fd92b09f170c3b567ec59030bf0a?hp=-c

Merge remote branch 'smcv/ready/tag-test'
---

db9f2b1b2b97fd92b09f170c3b567ec59030bf0a
diff --combined t/tag.t
index 5b0d9c824,693900c43..2d0a6e662
--- a/t/tag.t
+++ b/t/tag.t
@@@ -58,29 -58,26 +58,30 @@@ IkiWiki::Plugin::tag::preprocess_tag(pa
  is($autofiles{"tags/lucky.mdwn"}{plugin}, "tag");
  is($autofiles{"tags/numbers.mdwn"}{plugin}, "tag");
  is($autofiles{"tags/primes.mdwn"}{plugin}, "tag");
+ is_deeply([sort keys %autofiles], [qw(tags/lucky.mdwn tags/numbers.mdwn tags/primes.mdwn)]);
  
  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}) || diag explain \%pages;
 -is_deeply(\@del, []) || diag explain \@del;
 +is_deeply(\%pages, {"t/tmp/tags/lucky" => 1});
 +is_deeply(\@del, []);
  ok(-s "t/tmp/tags/lucky.mdwn");
  
  # generating an autofile that already exists does nothing
  %pages = @del = ();
  IkiWiki::gen_autofile("tags/numbers.mdwn", \%pages, \@del);
 -is_deeply(\%pages, {}) || diag explain \%pages;
 -is_deeply(\@del, []) || diag explain \@del;
 +is_deeply(\%pages, {});
 +is_deeply(\@del, []);
  
  # generating an autofile that we just deleted does nothing
  %pages = ();
  @del = ('tags/primes.mdwn');
  IkiWiki::gen_autofile("tags/primes.mdwn", \%pages, \@del);
 -is_deeply(\%pages, {}) || diag explain \%pages;
 -is_deeply(\@del, ['tags/primes.mdwn']) || diag explain \@del;
 +is_deeply(\%pages, {});
 +is_deeply(\@del, ['tags/primes.mdwn']);
 +
 +
 +# cleanup
 +ok(! system("rm -rf t/tmp"));
  
  1;