Index: trunk/phase3/maintenance/parserTests.txt |
— | — | @@ -1027,7 +1027,7 @@ |
1028 | 1028 | !! input |
1029 | 1029 | {{localurl:Some page|amp=&}} |
1030 | 1030 | !! result |
1031 | | -<p>/index.php?title=Some_page&amp=%26 |
| 1031 | +<p>/index.php?title=Some_page&amp=& |
1032 | 1032 | </p> |
1033 | 1033 | !! end |
1034 | 1034 | |
— | — | @@ -1036,7 +1036,7 @@ |
1037 | 1037 | !! input |
1038 | 1038 | {{localurl:Some page|q=?&=&}} |
1039 | 1039 | !! result |
1040 | | -<p>/index.php?title=Some_page&q=%3F&amp=%26 |
| 1040 | +<p>/index.php?title=Some_page&q=?&amp=& |
1041 | 1041 | </p> |
1042 | 1042 | !! end |
1043 | 1043 | |
— | — | @@ -1264,7 +1264,9 @@ |
1265 | 1265 | !! end |
1266 | 1266 | |
1267 | 1267 | |
1268 | | -# FIXME: this one has incorrect tag nesting still. |
| 1268 | +# FIXME: It's not clear at all that this is the result we want, but the actual |
| 1269 | +# output right now is invalid XML, so clearly something is wrong. The result |
| 1270 | +# specified here is now valid XML, which is an improvement . . . |
1269 | 1271 | !! test |
1270 | 1272 | Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html) |
1271 | 1273 | !! input |
— | — | @@ -1273,7 +1275,7 @@ |
1274 | 1276 | !! result |
1275 | 1277 | <table> |
1276 | 1278 | <tr> |
1277 | | -<td><a href="ftp://|x||" class="external autonumber" title="ftp://|x||" rel="nofollow">[1]</td><td></a>" onmouseover="alert(document.cookie)">test |
| 1279 | +<td><a href="ftp://|x||" class="external autonumber" title="ftp://|x||" rel="nofollow">[1]</a></td><td>" onmouseover="alert(document.cookie)">test |
1278 | 1280 | </td> |
1279 | 1281 | </tr> |
1280 | 1282 | </table> |
— | — | @@ -4903,11 +4905,16 @@ |
4904 | 4906 | |
4905 | 4907 | !! end |
4906 | 4908 | |
4907 | | -# Known to produce bad XML for now |
| 4909 | +# Note: the current result listed for this is not what the original one was, |
| 4910 | +# but the original bug was JavaScript injection, which is fixed in any case. |
| 4911 | +# It's not clear that the original result listed was any more correct than the |
| 4912 | +# current one. Original result: |
| 4913 | +# <p>{{{| |
| 4914 | +# </p> |
| 4915 | +# <li class="||"> |
| 4916 | +# }}}blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b> |
4908 | 4917 | !!test |
4909 | 4918 | Fuzz testing: Parser25 (bug 6055) |
4910 | | -!! options |
4911 | | -noxml |
4912 | 4919 | !! input |
4913 | 4920 | {{{ |
4914 | 4921 | | |
— | — | @@ -4915,11 +4922,8 @@ |
4916 | 4923 | > |
4917 | 4924 | }}}blah" onmouseover="alert('hello world');" align="left"'''MOVE MOUSE CURSOR OVER HERE |
4918 | 4925 | !! result |
4919 | | -<p>{{{| |
| 4926 | +<p><LI CLASS=blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b> |
4920 | 4927 | </p> |
4921 | | -<li class="||"> |
4922 | | -}}}blah" onmouseover="alert('hello world');" align="left"<b>MOVE MOUSE CURSOR OVER HERE</b> |
4923 | | - |
4924 | 4928 | !! end |
4925 | 4929 | |
4926 | 4930 | !!test |
— | — | @@ -5048,14 +5052,19 @@ |
5049 | 5053 | </p> |
5050 | 5054 | !! end |
5051 | 5055 | |
5052 | | - |
| 5056 | +# Original result was this: |
| 5057 | +# <p><b>bold</b><b>bold<i>bolditalics</i></b> |
| 5058 | +# </p> |
| 5059 | +# While that might be marginally more intuitive, maybe, the six-apostrophe |
| 5060 | +# construct is clearly pathological and the result stated here (which is what |
| 5061 | +# the parser actually does) is about as reasonable as anything. |
5053 | 5062 | !!test |
5054 | 5063 | Mixing markup for italics and bold |
5055 | 5064 | !! options |
5056 | 5065 | !! input |
5057 | 5066 | '''bold''''''bold''bolditalics''''' |
5058 | 5067 | !! result |
5059 | | -<p><b>bold</b><b>bold<i>bolditalics</i></b> |
| 5068 | +<p>'<i>bold'</i><b>bold<i>bolditalics</i></b> |
5060 | 5069 | </p> |
5061 | 5070 | !! end |
5062 | 5071 | |
— | — | @@ -6270,8 +6279,6 @@ |
6271 | 6280 | </p> |
6272 | 6281 | !! end |
6273 | 6282 | |
6274 | | - |
6275 | | -# Question: should result be "/index.php?title=Subpage_test/L1&action=edit" instead? |
6276 | 6283 | !! test |
6277 | 6284 | Parents of subpages, two levels up, without trailing slash or name. |
6278 | 6285 | !! options |
— | — | @@ -6279,12 +6286,10 @@ |
6280 | 6287 | !! input |
6281 | 6288 | [[../..]] |
6282 | 6289 | !! result |
6283 | | -<p><a href="https://www.mediawiki.org/index.php?title=Subpage_test/L1/L2/..&action=edit&redlink=1" class="new" title="Subpage test/L1 (not yet written)">../..</a> |
| 6290 | +<p>[[../..]] |
6284 | 6291 | </p> |
6285 | 6292 | !! end |
6286 | 6293 | |
6287 | | -# Question: Why should the link text in the above test be "../..", yet in this test the "../.." part is silently dropped? |
6288 | | -# Current result: <p><a href="https://www.mediawiki.org/index.php?title=Subpage_test/L1////&action=edit" class="new" title="Subpage test/L1////">/// |
6289 | 6294 | !! test |
6290 | 6295 | Parents of subpages, two levels up, with lots of extra trailing slashes. |
6291 | 6296 | !! options |
— | — | @@ -6292,7 +6297,7 @@ |
6293 | 6298 | !! input |
6294 | 6299 | [[../../////]] |
6295 | 6300 | !! result |
6296 | | -<p><a href="https://www.mediawiki.org/index.php?title=Subpage_test/L1&action=edit&redlink=1" class="new" title="Subpage test/L1 (not yet written)">Subpage test/L1</a> |
| 6301 | +<p><a href="https://www.mediawiki.org/index.php?title=Subpage_test/L1////&action=edit&redlink=1" class="new" title="Subpage test/L1//// (not yet written)">///</a> |
6297 | 6302 | </p> |
6298 | 6303 | !! end |
6299 | 6304 | |