X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0357ad66eaf739299db1df38bbddc289c561b034..841a86a4f369ac091c517015477a59800fbcb2e9:/t/inline.t?ds=sidebyside

diff --git a/t/inline.t b/t/inline.t
index b34cd27dc..f2ffbbc2f 100755
--- a/t/inline.t
+++ b/t/inline.t
@@ -6,6 +6,8 @@ use IkiWiki;
 
 my $blob;
 
+my $add_new_post = gettext("Add a new post titled:");
+
 ok(! system("rm -rf t/tmp"));
 ok(! system("mkdir t/tmp"));
 
@@ -20,40 +22,49 @@ 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]]');
+	'[[!inline pages="friends/*" postform=yes sort=title show=2]]');
 write_old_file("antagonists.mdwn",
 	'[[!inline pages="antagonists/*"]]');
 write_old_file("enemies.mdwn",
-	'[[!inline pages="enemies/*" postform=no rootpage=enemies]]');
+	'[[!inline pages="enemies/*" postform=no rootpage=enemies sort=title reverse=yes show=2]]');
 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*");
+		friends/garrus friends/liara friends/midna friends/telma
+		enemies/benezia enemies/geth enemies/rachni
+		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";
+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"));
+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{\Q$add_new_post\E}, '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{\Q$add_new_post\E}, 'postform=yes forces postform');
 like($blob, qr{<input type="hidden" name="from" value="friends"},
 	'implicit rootpage is /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');
 
 $blob = readfile("t/tmp/out/antagonists.html");
-unlike($blob, qr{Add a new post}, 'default is no postform');
+unlike($blob, qr{\Q$add_new_post\E}, 'default is no postform');
 
 $blob = readfile("t/tmp/out/enemies.html");
-unlike($blob, qr{Add a new post}, 'postform=no forces no postform');
+unlike($blob, qr{\Q$add_new_post\E}, 'postform=no forces no postform');
+like($blob, qr[this page is {enemies/zant}.*this page is {enemies/rachni}]s,
+	'first two pages in reversed sort order are present');
+unlike($blob, qr{enemies/(?:benezia|geth)},
+	'pages excluded by show should not be present');
 
 done_testing;