1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
|
From: Simon McVittie <smcv@debian.org>
Date: Fri, 22 Jul 2016 09:32:09 +0100
Subject: t: don't assert that tidy will add a HTML 3.2 doctype
tidy-html5 adds the HTML5 doctype, <!DOCTYPE html>.
Signed-off-by: Simon McVittie <smcv@debian.org>
t/roundtrip.t | 3 ++-
t/wordwrap.t | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
@@ -26,12 +26,13 @@
is_deeply( \@messages, [], q{The cleaned stuff shouldn't have any errors} );
$clean =~ s/"((HTML Tidy|tidyp).+w3\.org|HTML Tidy for HTML5[^"]+)"/"Tidy"/;
+$clean =~ s/<!DOCTYPE html[^>]*>/<!DOCTYPE html>/;
my $expected = do { local $/ = undef; <DATA> };
is( $clean, $expected, 'Cleaned up properly' );
__DATA__
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<!DOCTYPE html>
<html>
<head>
<meta name="generator" content="Tidy">
@@ -11,7 +11,7 @@
my $expected=<<'EOD';
<!DOCTYPE
-html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+html>
<html>
<head>
<title>
@@ -32,6 +32,7 @@
my $tidy = HTML::Tidy->new( {config_file => $cfg} );
my $result = $tidy->clean( $input );
+$result =~ s/<!DOCTYPE ?\nhtml[^>]*>/<!DOCTYPE \nhtml>/;
my @result = split(/\n/, $result);
is_deeply( \@result, \@expected, 'Cleaned stuff looks like what we expected');
@@ -24,7 +24,7 @@
);
sub _expected_empty_html {
- return qr{<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+ return qr{<!DOCTYPE html>
<html>
<head>
<meta name="generator" content="[^"]+">
|