diff options
| author | Mike Dirolf <mike@dirolf.com> | 2012-01-14 13:10:44 -0500 |
|---|---|---|
| committer | Mike Dirolf <mike@dirolf.com> | 2012-01-14 13:10:44 -0500 |
| commit | a2377e1129331430998de821ed3abf38247edca1 (patch) | |
| tree | d50080a6cb7e3d8c0cd044e9c79dc7fc1ce84fd1 /tests | |
| parent | 542324b626e96eb368c1cac34beba2b95af5deb7 (diff) | |
| download | markdown-a2377e1129331430998de821ed3abf38247edca1.tar.gz markdown-a2377e1129331430998de821ed3abf38247edca1.tar.bz2 markdown-a2377e1129331430998de821ed3abf38247edca1.zip | |
When safe mode is 'escape', don't allow bad html to stop further processing.
See tests/html4_safe/html_then_blockquote.(txt|html).
It looks like having unclosed block-level html elements was causing
further processing not to happen, even in the case where we're
escaping HTML. Since we're escaping HTML, it seems like it shouldn't
affect processing at all. This changes output results in a couple
of other tests, but the new output seems reasonable to me.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/html4_safe/html_then_blockquote.html | 6 | ||||
| -rw-r--r-- | tests/html4_safe/html_then_blockquote.txt | 6 | ||||
| -rw-r--r-- | tests/safe_mode/inline-html-simple.html | 11 | ||||
| -rw-r--r-- | tests/safe_mode/script_tags.html | 26 |
4 files changed, 28 insertions, 21 deletions
diff --git a/tests/html4_safe/html_then_blockquote.html b/tests/html4_safe/html_then_blockquote.html new file mode 100644 index 0000000..5833cd4 --- /dev/null +++ b/tests/html4_safe/html_then_blockquote.html @@ -0,0 +1,6 @@ +<p>to:</p> +<p><td /><td style="text-align: center; white-space: nowrap;"><br /></p> +<blockquote> +<p>3) You don't need to alter all localization files. + Adding the new labels to the en_US files will do it.</p> +</blockquote>
\ No newline at end of file diff --git a/tests/html4_safe/html_then_blockquote.txt b/tests/html4_safe/html_then_blockquote.txt new file mode 100644 index 0000000..544df67 --- /dev/null +++ b/tests/html4_safe/html_then_blockquote.txt @@ -0,0 +1,6 @@ +to: + +<td /><td style="text-align: center; white-space: nowrap;"><br /> + +> 3) You don't need to alter all localization files. +> Adding the new labels to the en_US files will do it. diff --git a/tests/safe_mode/inline-html-simple.html b/tests/safe_mode/inline-html-simple.html index ad19a77..aca9af0 100644 --- a/tests/safe_mode/inline-html-simple.html +++ b/tests/safe_mode/inline-html-simple.html @@ -29,7 +29,8 @@ Blah <pre><code><!-- Comment --> </code></pre> <p>Just plain comment, with trailing spaces on the line:</p> -<p><!-- foo --></p> +<p><!-- foo --> <br /> +</p> <p>Code:</p> <pre><code><hr /> </code></pre> @@ -37,9 +38,11 @@ Blah <p><hr></p> <p><hr/></p> <p><hr /></p> -<p><hr></p> -<p><hr/></p> -<p><hr /></p> +<p><hr> <br /> +</p> +<p><hr/><br /> +</p> +<p><hr /> </p> <p><hr class="foo" id="bar" /></p> <p><hr class="foo" id="bar"/></p> <p><hr class="foo" id="bar" ></p>
\ No newline at end of file diff --git a/tests/safe_mode/script_tags.html b/tests/safe_mode/script_tags.html index df63ffc..f3b059d 100644 --- a/tests/safe_mode/script_tags.html +++ b/tests/safe_mode/script_tags.html @@ -1,13 +1,11 @@ <p>This should be stripped/escaped in safe_mode.</p> <p><script> -alert("Hello world!") +alert("Hello world!") </script></p> <p>With blank lines.</p> -<p><script> - -alert("Hello world!") - -</script></p> +<p><script></p> +<p>alert("Hello world!")</p> +<p></script></p> <p>Now with some weirdness</p> <p><code><script <!-- alert("Hello world!") @@ -15,14 +13,8 @@ alert("Hello world!") <p>Try another way.</p> <p><script <!-- alert("Hello world!") -</script <> - -This time with blank lines. - -<script <!-- - -alert("Hello world!") - -</script <> - -</p>
\ No newline at end of file +</script <></p> +<p>This time with blank lines.</p> +<p><script <!--</p> +<p>alert("Hello world!")</p> +<p></script <></p>
\ No newline at end of file |