diff options
author | Simon McVittie <smcv@debian.org> | 2015-11-30 20:55:34 +0000 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2015-11-30 20:55:34 +0000 |
commit | b199349ffddce2b8afd89567882e182f7ef9bff1 (patch) | |
tree | 41f7f91ddd28dd43a60b44e4715e97cd5806d68c /t | |
parent | 67906ded049f5c52a541b1c7364829ea4ce7b58b (diff) | |
parent | ab768a62c66335a96a5791c444e54b8ae3b078b1 (diff) | |
download | ikiwiki-b199349ffddce2b8afd89567882e182f7ef9bff1.tar ikiwiki-b199349ffddce2b8afd89567882e182f7ef9bff1.tar.gz |
Merge remote-tracking branch 'smcv/ready/limit'
Diffstat (limited to 't')
-rwxr-xr-x | t/inline.t | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/inline.t b/t/inline.t index 41957f89e..859e1701a 100755 --- a/t/inline.t +++ b/t/inline.t @@ -40,9 +40,10 @@ sub write_old_file { write_old_file("protagonists.mdwn", '[[!inline pages="protagonists/*" rootpage="protagonists/new"]]'); write_old_file("friends.mdwn", - '[[!inline pages="friends/*" postform=yes sort=title show=2]]'); + '[[!inline pages="friends/*" postform=yes sort=title limit=2]]'); write_old_file("antagonists.mdwn", '[[!inline pages="antagonists/*"]]'); +# using old spelling of "limit" ("show") to verify backwards compat write_old_file("enemies.mdwn", '[[!inline pages="enemies/*" postform=no rootpage=enemies sort=title reverse=yes show=2]]'); foreach my $page (qw(protagonists/shepard protagonists/link @@ -68,7 +69,7 @@ like($blob, qr{<input type="hidden" name="from" value="friends"}, like($blob, qr[this page is \{friends/garrus}.*this page is \{friends/liara}]s, 'first two pages in desired sort order are present'); unlike($blob, qr{friends/(?:midna|telma)}, - 'pages excluded by show should not be present'); + 'pages excluded by limit should not be present'); $blob = readfile("t/tmp/out/antagonists.html"); unlike($blob, qr{\Q$add_new_post\E}, 'default is no postform'); |