* Rebuilding on upgrade to this version is recommended.

* Add a html validity check to the test suite, using the wdg-html-validator,
  if available.
* Make the html valid when there is nothing in the actions list by adding an
  empty <li> to the end of it.
* Reordered some function call parameters for consistency.

2 files changed, 43 insertions, 12 deletions

diff --git a/t/html.t b/t/html.t
new file mode 100755
index 000000000..f2955f75f
--- /dev/null
+++ b/t/html.t
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More;
+
+my @pages;
+
+BEGIN {
+	@pages=qw(index todo features news);
+	if (! -x "/usr/bin/validate") {
+		plan skip_all => "/usr/bin/validate html validator not present";
+	}
+	else {
+		plan(tests => int @pages + 3);
+	}
+	use_ok("IkiWiki");
+	use_ok("IkiWiki::Render");
+}
+
+# Have to build the html pages first.
+# Note that just building them like this doesn't exersise all the possible
+# html that can be generated, in particular it misses some of the action
+# links at the top, etc.
+ok(system("make >/dev/null") == 0);
+
+foreach my $page (@pages) {
+        print "# Validating $page\n";
+	ok(system("validate html/$page.html") == 0);
+}
+
+# TODO: validate form output html
diff --git a/t/linkify.t b/t/linkify.t
index c231d734b..47eee6e0d 100755
--- a/t/linkify.t
+++ b/t/linkify.t
@@ -4,8 +4,8 @@ use strict;
 use Test::More tests => 11;
 
 sub linkify ($$$) {
-	my $content=shift;
 	my $page=shift;
+	my $content=shift;
 	my @existing_pages=@{shift()};
 	
 	# This is what linkify and htmllink need set right now to work.
@@ -17,7 +17,7 @@ sub linkify ($$$) {
 	}
 	%IkiWiki::config=IkiWiki::defaultconfig();
 
-	return IkiWiki::linkify($content, $page);
+	return IkiWiki::linkify($page, $content);
 }
 
 sub links_to ($$) {
@@ -62,13 +62,13 @@ sub links_text ($$) {
 
 BEGIN { use_ok("IkiWiki::Render"); }
 
-ok(links_to("bar", linkify("link to [[bar]] ok", "foo", ["foo", "bar"])), "ok link");
-ok(not_links_to("bar", linkify("link to \\[[bar]] ok", "foo", ["foo", "bar"])), "escaped link");
-ok(links_to("page=bar", linkify("link to [[bar]] ok", "foo", ["foo"])), "broken link");
-ok(links_to("bar", linkify("link to [[baz]] and [[bar]] ok", "foo", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("baz", linkify("link to [[baz]] and [[bar]] ok", "foo", ["foo", "baz", "bar"])), "dual links");
-ok(links_to("bar", linkify("link to [[some_page|bar]] ok", "foo", ["foo", "bar"])), "named link");
-ok(links_text("some page", linkify("link to [[some_page|bar]] ok", "foo", ["foo", "bar"])), "named link text");
-ok(links_to("bar", linkify("link to [[some page|bar]] ok", "foo", ["foo", "bar"])), "named link, with whitespace");
-ok(links_text("some page", linkify("link to [[some page|bar]] ok", "foo", ["foo", "bar"])), "named link text, with whitespace");
-ok(links_text("Some long, & complex page name.", linkify("link to [[Some long, & complex page name.|bar]] ok, and this is not a link]] here", "foo", ["foo", "bar"])), "complex named link text");
+ok(links_to("bar", linkify("foo", "link to [[bar]] ok", ["foo", "bar"])), "ok link");
+ok(not_links_to("bar", linkify("foo", "link to \\[[bar]] ok", ["foo", "bar"])), "escaped link");
+ok(links_to("page=bar", linkify("foo", "link to [[bar]] ok", ["foo"])), "broken link");
+ok(links_to("bar", linkify("foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
+ok(links_to("baz", linkify("foo", "link to [[baz]] and [[bar]] ok", ["foo", "baz", "bar"])), "dual links");
+ok(links_to("bar", linkify("foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link");
+ok(links_text("some page", linkify("foo", "link to [[some_page|bar]] ok", ["foo", "bar"])), "named link text");
+ok(links_to("bar", linkify("foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link, with whitespace");
+ok(links_text("some page", linkify("foo", "link to [[some page|bar]] ok", ["foo", "bar"])), "named link text, with whitespace");
+ok(links_text("Some long, & complex page name.", linkify("foo", "link to [[Some long, & complex page name.|bar]] ok, and this is not a link]] here", ["foo", "bar"])), "complex named link text");