aboutsummaryrefslogtreecommitdiffstats
path: root/tests/safe_mode
diff options
context:
space:
mode:
authorWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
committerWaylan Limberg <waylan@gmail.com>2012-01-18 21:29:19 -0500
commitc33dbafc2663e2d495c53ab0bf26f5f6c4087863 (patch)
treea00f8f59e2774438cf66125b362016a19ad1393e /tests/safe_mode
parent77c587e1d16934608fc91aa34894836ef0d03a8b (diff)
parent69b365d07c7fabb206d9094398de2162cbcf6ba3 (diff)
downloadmarkdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.gz
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.tar.bz2
markdown-c33dbafc2663e2d495c53ab0bf26f5f6c4087863.zip
Merge branch 'master' of git://github.com/fiesta/Python-Markdown into fiesta
Conflicts: markdown/inlinepatterns.py
Diffstat (limited to 'tests/safe_mode')
-rw-r--r--tests/safe_mode/inline-html-simple.html11
-rw-r--r--tests/safe_mode/script_tags.html26
2 files changed, 16 insertions, 21 deletions
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>&lt;!-- Comment --&gt;
</code></pre>
<p>Just plain comment, with trailing spaces on the line:</p>
-<p>&lt;!-- foo --&gt;</p>
+<p>&lt;!-- foo --&gt; <br />
+</p>
<p>Code:</p>
<pre><code>&lt;hr /&gt;
</code></pre>
@@ -37,9 +38,11 @@ Blah
<p>&lt;hr&gt;</p>
<p>&lt;hr/&gt;</p>
<p>&lt;hr /&gt;</p>
-<p>&lt;hr&gt;</p>
-<p>&lt;hr/&gt;</p>
-<p>&lt;hr /&gt;</p>
+<p>&lt;hr&gt; <br />
+</p>
+<p>&lt;hr/&gt;<br />
+</p>
+<p>&lt;hr /&gt; </p>
<p>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot; /&gt;</p>
<p>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot;/&gt;</p>
<p>&lt;hr class=&quot;foo&quot; id=&quot;bar&quot; &gt;</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>&lt;script&gt;
-alert(&quot;Hello world!&quot;)
+alert("Hello world!")
&lt;/script&gt;</p>
<p>With blank lines.</p>
-<p>&lt;script&gt;
-
-alert(&quot;Hello world!&quot;)
-
-&lt;/script&gt;</p>
+<p>&lt;script&gt;</p>
+<p>alert("Hello world!")</p>
+<p>&lt;/script&gt;</p>
<p>Now with some weirdness</p>
<p><code>&lt;script &lt;!--
alert("Hello world!")
@@ -15,14 +13,8 @@ alert("Hello world!")
<p>Try another way.</p>
<p>&lt;script &lt;!--
alert(&quot;Hello world!&quot;)
-&lt;/script &lt;&gt;
-
-This time with blank lines.
-
-&lt;script &lt;!--
-
-alert(&quot;Hello world!&quot;)
-
-&lt;/script &lt;&gt;
-
-</p> \ No newline at end of file
+&lt;/script &lt;&gt;</p>
+<p>This time with blank lines.</p>
+<p>&lt;script &lt;!--</p>
+<p>alert("Hello world!")</p>
+<p>&lt;/script &lt;&gt;</p> \ No newline at end of file