Don't fail to syslog if the wiki name contains %s

[git.ikiwiki.info.git] / t / inline.t

diff --git a/t/inline.t b/t/inline.t
index 41957f89ebb321b9eb5d8b82525ad2f9553ab49b..859e1701ac211eaff100496b13d53b5c20ce6852 100755 (executable)
--- 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",
 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/*"]]');
 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
 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)},
 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');
 
 $blob = readfile("t/tmp/out/antagonists.html");
 unlike($blob, qr{\Q$add_new_post\E}, 'default is no postform');