From: Arlo Breault
Date: Wed, 22 Feb 2017 17:10:42 +0000 (-0800)
Subject: Sync up with Parsoid parserTests.txt
X-Git-Tag: 1.31.0-rc.0~4027
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=0366498177584befce06fc6cc4b1913dea904e5e;p=lhc%2Fweb%2Fwiklou.git
Sync up with Parsoid parserTests.txt
This now aligns with Parsoid commit e23a818554548cd922ee262ea1d8da47ea457248
Change-Id: Ib26b170c51aa4425a54871fa32543b2eef5db41e
---
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 35b01907f3..7060c4d3fd 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -1488,9 +1488,11 @@ nowiki 3
Entities inside
!! wikitext
<
-!! html
+!! html/php
<
+!! html/parsoid
+
<
!! end
!! test
@@ -2311,8 +2313,12 @@ Entities inside
Foo âbar
!! end
+## Don't expect this to rt, Parsoid drops the unmatched closing pre tags that
+## aren't enclosed in nowikis.
!! test
and
preference (first one wins)
+!! options
+parsoid=wt2html
!! wikitext
@@ -2341,17 +2347,16 @@ Entities inside
</pre>
!! html/parsoid
-
<nowiki>
+
<nowiki>
-
</nowiki>
-</pre>
+
</nowiki>
+
<pre>
<nowiki>
</pre>
-
-</pre>
+
!! end
!! test
@@ -2366,8 +2371,6 @@ Entities inside
# Parsoid doesn't strip empty tags, like Tidy does.
!! test
Empty pre; pre inside other HTML tags (T56946)
-!! options
-parsoid=wt2html,wt2wt
!! wikitext
a
@@ -2392,9 +2395,9 @@ foo
!! html/parsoid
a
-
foo
+
foo
-
+
!! end
!! test
@@ -2410,7 +2413,7 @@ HTML pre followed by indent-pre
# Note that tidy removes the empty
tags from the start and end.
# Parsoid does not, by design.
-!!test
+!! test
Block tag pre
!! wikitext
foo
@@ -2419,8 +2422,8 @@ Block tag pre
foo
!! html/parsoid
-
foo
-!!end
+
foo
+!! end
!!test
Templates: Indent-Pre: 1a. Templates that break a line should suppress
@@ -2541,8 +2544,11 @@ Templates: Indent-Pre: 1f: Wrapping should be based on expanded content
!!end
+## Hmm, should Parsoid rt this?
!! test
Pres with newline attributes
+!! options
+parsoid=wt2html,html2html
!! wikitext
hi
@@ -2550,8 +2556,7 @@ two">hi
hi
!! html/parsoid
-
hi
+
hi
!! end
!! test
@@ -2583,7 +2588,7 @@ x
<pre
!! html/parsoid
-
x
+
x
<pre
@@ -2601,7 +2606,7 @@ parsoid=wt2html
{{echo|foo}}
!! html/parsoid
-
{{echo|foo}}
+
{{echo|foo}}
!! end
# TODO / maybe: fix wt2wt for this
@@ -3266,6 +3271,17 @@ array (
a
!! end
+!! test
+5. Indent-Pre and html pre
+!! wikitext
+
hi
+!! html/php
+
hi
+
+!! html/parsoid
+
hi
+!! end
+
!!test
Render paragraphs when indent-pre is suppressed in blocklevels
!! wikitext
@@ -3455,18 +3471,17 @@ foo
foo
!! html/parsoid
-
foo
+
foo
-
-foo
+
foo
-
+
foo
-
+
foo
@@ -3510,7 +3525,7 @@ haha
!! html/parsoid
-
+
@@ -3561,7 +3576,7 @@ HTML-pre: 3: other wikitext
!! html/parsoid
-
* foo
+
* foo
# bar
= no-h =
'' no-italic ''
@@ -6969,12 +6984,6 @@ Wikitext table with html-syntax row
foo
!! end
-## Note that Parsoid output differs from PHP and PHP+tidy here.
-## The lack of
tags in the PHP output is arguably a bug in the
-## PHP parser, which tidy then compounds by fostering the content
-## entirely out of the table. Parsoid recognizes the table context
-## and generates
and
wrappers as needed. Hopefully nobody
-## depends on PHP's treatment of broken table markup!
!! test
Implicit
after a |-
!! options
@@ -6993,56 +7002,12 @@ a
!! html/php+tidy
a
!! html/parsoid
-
-
a
-
-!! end
-
-# Again, Parsoid adds implicit
s here, PHP and Tidy strip the b out.
-!! test
-
tags should be recognized in an explicit
context, but not in an implicit
context
-!! options
-parsoid=wt2html,html2html
-!! wikitext
-{|
-|-
-|
- a
-|-
- b
-|}
-!! html/php
-
-
-
-
-
a
-
-
- b
-
+
a
+
-!! html/php+tidy
-
b
-
-
-
-
-a
-
-
-
-!! html/parsoid
-
-
-
a
-
b
-
-
+
!! end
-# PHP + Tidy strips the list out of the table; Parsoid wraps it.
-# Parsoid generates the missing
, so wt2wt won't succeed.
!! test
Lists should be recognized in an implicit
!! end
!! test
@@ -7090,8 +7052,7 @@ Table cells not properly parsed in an implicit-td context
!! html/parsoid
-
a
b
-
+
a
b
!! end
!! test
@@ -7531,7 +7492,7 @@ Piped link with no link text
!! test
Piped link with empty link text
!! wikitext
-[[Main Page|]] - empty nowiki
+[[Main Page|]] - empty nowiki
[[Main Page| ]] - empty space
[[Main Page| ]] - empty non breaking space
!! html/php
@@ -7540,7 +7501,7 @@ Piped link with empty link text
- empty non breaking space
!! html/parsoid
-
- empty nowiki
+
- empty nowiki
- empty space
 - empty non breaking space
!! end
@@ -7881,6 +7842,22 @@ Link containing double quotes and spaces
+!! end
-!!test
+!! test
Fuzz testing: image with bogus manual thumbnail
!! wikitext
[[Image:foobar.jpg|thumbnail= ]]
@@ -17943,15 +17921,17 @@ Fuzz testing: image with bogus manual thumbnail
!! html/parsoid
-!!end
+!! end
!! test
Fuzz testing: encoded newline in generated HTML replacements (T8577)
!! wikitext
-!! html
+!! html/php
+!! html/parsoid
+
!! end
!! test
@@ -20750,9 +20730,6 @@ Nested: -{zh-hans:Hi -{zh-cn:China;zh-sg:Singapore;}-;zh-hant:Hello -{zh-tw:Taiw
!! end
-# Since Parsoid is starting to emit canonical wikitext for links,
-# [http://example.com http://example.com] will not RT back to that
-# form anymore.
!! test
HTML markups with conversion syntax in attribs, nested in other conversion blocks
!! options
@@ -20775,6 +20752,9 @@ language=zh variant=zh-cn disabled
!! end
+# Since Parsoid is starting to emit canonical wikitext for links,
+# [http://example.com http://example.com] will not RT back to that
+# form anymore.
!! test
Proper conversion of text in external links
!! options
@@ -22758,573 +22738,6 @@ parsoid=wt2html,wt2wt
!! end
-#### ----------------------------------------------------------------
-#### Parsoid-only testing of Parsoid's impl of and
-#### tags. Parsoid's output for these tags differs from that of the
-#### PHP parser.
-#### ----------------------------------------------------------------
-
-!!test
-Ref: 1. ref-location should be replaced with an index span
-!! wikitext
-A foo
-B foo
-C
-
-!! html/parsoid
-
-
-!!end
-
-# NOTE: constructor is a predefined property in JS and constructor as a ref-name can clash with it if not handled properly)
-!!test
-Ref: 4. 'constructor' should be accepted as a valid ref-name
-!! wikitext
-A foo
-
-!! html/parsoid
-
-
-!!end
-
-!!test
-Ref: 5. body should accept generic wikitext
-!! wikitext
-A
- This is a '''[[bolded link]]''' and this is a {{echo|transclusion}}
-
-
-
-!! html/parsoid
-
-
-!!end
-
-!!test
-Ref: 9. unclosed comments should not leak out of ref-body
-!! wikitext
-A foo
-
-!!end
-
-!!test
-Ref: 10. Unclosed HTML tags should not leak out of ref-body
-!! wikitext
-A foo B C
-
-
-!! html/parsoid
-
-
-!!end
-
-## Roundtripping fails because of nowiki'ing
-!! test
-Ref: 14. A nested ref-tag should be emitted as plain text
-!! options
-parsoid=wt2html
-!! wikitext
-foo bar baz
-
-
-!! html/parsoid
-
-
-!!end
-
-!!test
-Ref: 20. ref-tags with identical names but different content should keep it
-!! wikitext
-A Foo one
-B Foo two
-C
-
-
-!! html/parsoid
-
-
-!!end
-
-!!test
-References: 1. references tag without any refs should be handled properly
-!! wikitext
-
-!! html/parsoid
-
-!!end
-
-!!test
-References: 2. references tag with group only outputs references from that group
-!! wikitext
-A foo
-B bar
-C baz
-
-
-
-
-!! html/parsoid
-
-
-!!end
-
-## Don't expect this to rt since we're dropping content
-!! test
-References: 5. ref tags in references should be processed while ignoring all other content
-!! options
-parsoid=wt2html,html2html
-!! wikitext
-A
-B bar
-
-
-foo
-This should just get lost.
-
-!! html/parsoid
-
-
-!! end
-
-!! test
-References: 7. Multiple references tags (one without and one with nested refs) should be correctly handled
-!! wikitext
-A foo bar for a
-B
-
-
-
-
-foo
-
-!! html/parsoid
-
-
-!! end
-
-!! test
-References: 8. T88019: Remove s from templates inside that's itself inside a template
-!! wikitext
-X{{echo|foo {{echo|bar}} and {{echo|baz}} boo}}
-
-!! html/parsoid
-
-
-!!end
-
-# This test only works in wt2html now as the are always generated
-# unless selser is active. Once T72722 is fixed, we should add a changes test
-# here to ensure that unrelated changes don't add the new
-# when selser is active.
-!! test
-References: 9. Generate missing references list at the end
-!! wikitext
-A foo
-B bar
-!! html/parsoid
-
-
-!! end
-
-!! test
-References: 10. New shouldn't be added for unrelated edits.
-!! options
-parsoid={
- "modes": ["selser"],
- "changes": [["#x", "remove"]],
- "selser": "noauto"
-}
-!! wikitext
-Unrelated text that's going to disappear.
-A foo
-!! wikitext/edited
-Unrelated text.
-A foo
-!!end
-
-!! test
-Entities in ref name
-!! wikitext
-hi
-
-!! html/parsoid
-
-
-!! end
-
-## The output here may look funny, but it's what the php parser will do. The
-## unclosed references tag becomes escaped text, and then a new references
-## tag is auto-generated. The test is wt2html only because it roundtrips with
-## nowiki tags, and the auto-generated references tag is only dropped in
-## rtTestMode.
-!! test
-Generate references for unclosed references tag
-!! options
-parsoid=wt2html
-!! wikitext
-afoo
-
-
-!! html/parsoid
-