urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inline: postform=no should take precedence over rootpage existing 

If someone has explicitly disabled the postform, it seems reasonable
from a least-astonishment point of view for that to take precedence
over rootpage, even though that makes rootpage useless.

Also add a regression test; so far, this is all it tests.
master
Simon McVittie 2014-02-23 16:03:44 +00:00
parent 6d90e56c8d
commit 0357ad66ea
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/inline.pm
View File

@ -329,8 +329,12 @@ sub preprocess_inline (@) {
my $ret="";
if (length $config{cgiurl} && ! $params{preview} && (exists $params{rootpage} ||
(exists $params{postform} && yesno($params{postform}))) &&
my $postform = (exists $params{rootpage});
if (exists $params{postform}) {
$postform = yesno($params{postform});
}
if (length $config{cgiurl} && ! $params{preview} && $postform &&
IkiWiki->can("cgi_editpage")) {
# Add a blog post form, with feed buttons.
my $formtemplate=template_depends("blogpost.tmpl", $params{page}, blind_cache => 1);

59
t/inline.t 100755
View File

@ -0,0 +1,59 @@
#!/usr/bin/perl
use warnings;
use strict;
use Test::More;
use IkiWiki;
my $blob;
ok(! system("rm -rf t/tmp"));
ok(! system("mkdir t/tmp"));
sub write_old_file {
my $name = shift;
my $content = shift;
writefile($name, "t/tmp/in", $content);
ok(utime(333333333, 333333333, "t/tmp/in/$name"));
}
write_old_file("protagonists.mdwn",
'[[!inline pages="protagonists/*" rootpage="protagonists/new"]]');
write_old_file("friends.mdwn",
'[[!inline pages="friends/*" postform=yes]]');
write_old_file("antagonists.mdwn",
'[[!inline pages="antagonists/*"]]');
write_old_file("enemies.mdwn",
'[[!inline pages="enemies/*" postform=no rootpage=enemies]]');
foreach my $page (qw(protagonists/shepard protagonists/link
antagonists/saren antagonists/ganondorf
friends/liara friends/midna
enemies/benezia enemies/zant)) {
write_old_file("$page.mdwn", "this page is *$page*");
}
ok(! system("make -s ikiwiki.out"));
my $command = "perl -I. ./ikiwiki.out -set usedirs=0 -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tmp/in t/tmp/out -verbose";
ok(! system($command));
ok(! system("$command -refresh"));
$blob = readfile("t/tmp/out/protagonists.html");
like($blob, qr{Add a new post}, 'rootpage=yes gives postform');
like($blob, qr{<input type="hidden" name="from" value="protagonists/new"},
'explicit rootpage is /protagonists/new');
$blob = readfile("t/tmp/out/friends.html");
like($blob, qr{Add a new post}, 'postform=yes forces postform');
like($blob, qr{<input type="hidden" name="from" value="friends"},
'implicit rootpage is /friends');
$blob = readfile("t/tmp/out/antagonists.html");
unlike($blob, qr{Add a new post}, 'default is no postform');
$blob = readfile("t/tmp/out/enemies.html");
unlike($blob, qr{Add a new post}, 'postform=no forces no postform');
done_testing;