From: C. Scott Ananian
Date: Tue, 4 Aug 2015 16:30:20 +0000 (-0400)
Subject: Sync up with Parsoid parserTests.
X-Git-Tag: 1.31.0-rc.0~10529
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27user_edit%27%2C%20userid=session.user.id%29%20%7D%7D?a=commitdiff_plain;h=eade3aedf59b8263849d07d4d2f99d237a4c93f4;p=lhc%2Fweb%2Fwiklou.git
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit 19c5d8af12ea0a79141f3aa0634d0fd28fb30c5c
Change-Id: Ifffc18a38c6501706209d1b033d2305a7534ba61
---
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 9226d4ce0b..b9ff013625 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -160,6 +160,22 @@ Template:table_attribs_5
|style="color:red;"||Bar
!! endarticle
+!! article
+Template:table_attribs_6
+!! text
+style="background:
+
+
+red;" |
+!! endarticle
+
+!! article
+Template:table_attribs_7
+!! text
+
+|style{{=}}"background:#f9f9f9;"|Foofoo
+!! endarticle
+
!! article
Template:table_header_cells
!! text
@@ -1314,7 +1330,7 @@ Non-word characters don't terminate tag names + tidy
Non-word characters are valid in extension tags (T19663)
!! wikitext
tåg
-!! html
+!! html/php
'tåg'
array (
@@ -1325,11 +1341,15 @@ array (
!! test
Isolated close tags should be treated as literal text (bug 52760)
+!! options
+parsoid=wt2html
!! wikitext
s
-!! html+tidy
+!! html/php+tidy
+
<s.foo>s
+!! html/parsoid
<s.foo>s
!! end
@@ -1363,9 +1383,11 @@ Bare pipe character from a template (bug 52363)
unordered list
!! wikitext
* This is not an unordered list item.
-!! html
+!! html/php
* This is not an unordered list item.
+!! html/parsoid
+
* This is not an unordered list item.
!! end
!! test
@@ -1378,7 +1400,7 @@ sed abit.
:and a colon
-!! html
+!! html/php
Lorem ipsum dolor
sed abit.
@@ -1387,6 +1409,14 @@ sed abit.
:and a colon
+!! html/parsoid
+
Lorem ipsum dolor
+
+sed abit.
+ sed nullum.
+
+:and a colon
+
!! end
!! test
@@ -1400,7 +1430,7 @@ nowiki 3
*There is not nowiki.
*There is nowiki.
-!! html
+!! html/php
There is not nowiki.
There is nowiki.
There is not nowiki.
@@ -1408,6 +1438,15 @@ nowiki 3
There is not nowiki.
There is nowiki.
+!! html/parsoid
+
There is not nowiki.
+
There is nowiki.
+
+
There is not nowiki.
+
There is nowiki.
+
+
There is not nowiki.
+
There is nowiki.
!! end
!! test
@@ -1436,7 +1475,7 @@ parsoid=html2wt
!! html
* </nowiki> tag
!! wikitext
-* </nowiki> tag
+*</nowiki> tag
!! end
!! test
@@ -2223,7 +2262,7 @@ Entities inside
-!! html
+!! html/php
<nowiki>
@@ -2236,6 +2275,18 @@ Entities inside
</pre>
+!! html/parsoid
+
<nowiki>
+
+
</nowiki>
+</pre>
+
+
+<pre>
+<nowiki>
+</pre>
+
+</pre>
!! end
!! test
@@ -3397,7 +3448,7 @@ HTML-pre: 3: other wikitext
'' no-italic ''
[[ NoLink ]]
-!! html
+!! html/php
* foo
# bar
@@ -3406,6 +3457,13 @@ HTML-pre: 3: other wikitext
[[ NoLink ]]
!! end
!! test
@@ -6163,6 +6232,21 @@ Indented table markup mixed with indented pre content (proposed in bug 6200)
!! end
+## Edge case fix to prevent future regressions
+!! test
+T107652: s in templates that also generate table cell attributes should be rendered properly
+!! wikitext
+{|
+|{{table_attribs_7}}
+|}
+
+!! html/parsoid
+
+!! end
+
!! test
Table with row followed by newlines and table heading
!! wikitext
@@ -9632,6 +9716,15 @@ __NOEDITSECTION__
!! end
+!!test
+__proto__ is treated as normal wikitext (T105997)
+!!wikitext
+__proto__
+!!html
+
''None'' of '''this''' should be
* interpreted
but rather passed unmodified
@@ -11004,6 +11097,25 @@ Templates: Support for templates generating attributes and content
!! end
+# T107622
+!! test
+4. Entities and nowikis inside templated attributes should be handled correctly inside templated tables
+!! wikitext
+{|
+| {{table_attribs_6}} hi
+|}
+!! html/php
+
+
+
hi
+
+
+!! html/parsoid
+
+
hi
+
+!! end
+
!!test
Templates: HTML Tables: 1. Generating start of a HTML table
!! wikitext
@@ -11468,41 +11580,40 @@ Parser Functions: 2. Nested use (only outermost should be marked up)
!! test
pre-save transform: subst:
!! options
-PST
+pst
!! wikitext
{{subst:test}}
-!! html
+!! html/php
This is a test template
!! end
!! test
pre-save transform: normal template
!! options
-PST
+pst
!! wikitext
{{test}}
-!! html
+!! html/php
{{test}}
!! end
!! test
pre-save transform: nonexistent template
!! options
-PST
+pst
!! wikitext
{{thistemplatedoesnotexist}}
-!! html
+!! html/php
{{thistemplatedoesnotexist}}
!! end
-
!! test
pre-save transform: subst magic variables
!! options
-PST
+pst
!! wikitext
{{subst:SITENAME}}
-!! html
+!! html/php
MediaWiki
!! end
@@ -11513,7 +11624,7 @@ pre-save transform: subst: templates with parameters
pst
!! wikitext
{{subst:paramtest|param="something else"}}
-!! html
+!! html/php
This is a test template with parameter "something else"
!! end
@@ -11529,11 +11640,10 @@ pre-save transform: nowiki in subst (bug 1188)
pst
!! wikitext
{{subst:nowikitest}}
-!! html
+!! html/php
'''not wiki'''
!! end
-
!! article
Template:commenttest
!! text
@@ -11546,7 +11656,7 @@ pre-save transform: comment in subst (bug 1936)
pst
!! wikitext
{{subst:commenttest}}
-!! html
+!! html/php
This template has in it.
!! end
@@ -11556,7 +11666,7 @@ pre-save transform: unclosed tag
pst noxml
!! wikitext
'''not wiki'''
-!! html
+!! html/php
'''not wiki'''
!! end
@@ -11566,7 +11676,7 @@ pre-save transform: mixed tag case
pst noxml
!! wikitext
'''not wiki'''
-!! html
+!! html/php
'''not wiki'''
!! end
@@ -11576,7 +11686,7 @@ pre-save transform: unclosed comment in
pst noxml
!! wikitext
wikinowiki
-!! html
+!! html/php
!!end
@@ -11614,7 +11724,7 @@ pre-save transform: comment containing extension
pst
!! wikitext
-!! html
+!! html/php
!!end
@@ -11624,7 +11734,7 @@ pre-save transform: comment containing nowiki
pst
!! wikitext
-!! html
+!! html/php
!!end
@@ -11634,7 +11744,7 @@ pre-save transform: in subst (bug 3298)
pst
!! wikitext
{{subst:Includes}}
-!! html
+!! html/php
Foobar
!! end
@@ -11644,7 +11754,7 @@ pre-save transform: in subst (bug 3298)
pst
!! wikitext
{{subst:Includes2}}
-!! html
+!! html/php
Foo
!! end
@@ -11666,7 +11776,7 @@ bug 22297: safesubst: works during PST
pst
!! wikitext
{{subst:SafeSubstTest}}{{safesubst:SubstTest}}
-!! html
+!! html/php
FoobarFoobar
!! end
@@ -11702,7 +11812,7 @@ pst
[[|Article (context)]]
[[Bar:X (Y) Z|]]
[[:Bar:X (Y) Z|]]
-!! html
+!! html/php
[[Article (context)|Article]]
[[Bar:Article|Article]]
[[:Bar:Article|Article]]
@@ -11723,7 +11833,7 @@ pst
[[:interwiki:Article|]]
[[interwiki:Bar:Article|]]
[[:interwiki:Bar:Article|]]
-!! html
+!! html/php
[[interwiki:Article|Article]]
[[:interwiki:Article|Article]]
[[interwiki:Bar:Article|Bar:Article]]
@@ -11736,7 +11846,7 @@ pre-save transform: context links ("pipe trick") with parens in title
pst title=[[Somearticle (context)]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Article (context)|Article]]
!! end
@@ -11748,7 +11858,7 @@ pst title=[[Someplace, Somewhere]]
[[|Otherplace]]
[[Otherplace, Elsewhere|]]
[[Otherplace, Elsewhere, Anywhere|]]
-!! html
+!! html/php
[[Otherplace, Somewhere|Otherplace]]
[[Otherplace, Elsewhere|Otherplace]]
[[Otherplace, Elsewhere, Anywhere|Otherplace]]
@@ -11761,7 +11871,7 @@ pst title=[[Someplace (IGNORED), Somewhere]]
!! wikitext
[[|Otherplace]]
[[Otherplace (place), Elsewhere|]]
-!! html
+!! html/php
[[Otherplace, Somewhere|Otherplace]]
[[Otherplace (place), Elsewhere|Otherplace]]
!! end
@@ -11773,7 +11883,7 @@ pst title=[[Who, me? (context)]]
!! wikitext
[[|Yes, you.]]
[[Me, Myself, and I (1937 song)|]]
-!! html
+!! html/php
[[Yes, you. (context)|Yes, you.]]
[[Me, Myself, and I (1937 song)|Me, Myself, and I]]
!! end
@@ -11784,7 +11894,7 @@ pre-save transform: context links ("pipe trick") with namespace
pst title=[[Ns:Somearticle]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Ns:Article|Article]]
!! end
@@ -11794,7 +11904,7 @@ pre-save transform: context links ("pipe trick") with namespace and parens
pst title=[[Ns:Somearticle (context)]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Ns:Article (context)|Article]]
!! end
@@ -11804,7 +11914,7 @@ pre-save transform: context links ("pipe trick") with namespace and comma
pst title=[[Ns:Somearticle, Context, Whatever]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Ns:Article, Context, Whatever|Article]]
!! end
@@ -11814,7 +11924,7 @@ pre-save transform: context links ("pipe trick") with namespace, comma and paren
pst title=[[Ns:Somearticle, Context (context)]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Ns:Article (context)|Article]]
!! end
@@ -11824,7 +11934,7 @@ pre-save transform: context links ("pipe trick") with namespace, parens and comm
pst title=[[Ns:Somearticle (IGNORED), Context]]
!! wikitext
[[|Article]]
-!! html
+!! html/php
[[Ns:Article, Context|Article]]
!! end
@@ -11839,7 +11949,7 @@ pst
[[|Articleï¼contextï¼]]
[[Bar:Xï¼Yï¼Z|]]
[[:Bar:Xï¼Yï¼Z|]]
-!! html
+!! html/php
[[Articleï¼contextï¼|Article]]
[[Bar:Articleï¼contextï¼|Article]]
[[:Bar:Articleï¼contextï¼|Article]]
@@ -11859,7 +11969,7 @@ pst
[[|Article ï¼contextï¼]]
[[Bar:X ï¼Yï¼ Z|]]
[[:Bar:X ï¼Yï¼ Z|]]
-!! html
+!! html/php
[[Article ï¼contextï¼|Article]]
[[Bar:Article ï¼contextï¼|Article]]
[[:Bar:Article ï¼contextï¼|Article]]
@@ -11879,7 +11989,7 @@ pst
[[|Article(context)]]
[[Bar:X(Y)Z|]]
[[:Bar:X(Y)Z|]]
-!! html
+!! html/php
[[Article(context)|Article]]
[[Bar:Article(context)|Article]]
[[:Bar:Article(context)|Article]]
@@ -11899,7 +12009,7 @@ pst
[[Bar:Article (context)ï¼context|]]
[[:Bar:Article (context), context|]]
[[:Bar:Article (context)ï¼context|]]
-!! html
+!! html/php
[[Article (context), context|Article]]
[[Article (context)ï¼context|Article]]
[[Bar:Article (context), context|Article]]
@@ -11918,7 +12028,7 @@ Empty lines are trimmed
-!! html
+!! html/php
Empty lines are trimmed
!! end
@@ -11931,7 +12041,7 @@ pst
* ~~~
* ~~~
* ~~~
-!! html
+!! html/php
* [[Special:Contributions/127.0.0.1|127.0.0.1]]
* [[Special:Contributions/127.0.0.1|127.0.0.1]]
* [[Special:Contributions/127.0.0.1|127.0.0.1]]
@@ -11962,7 +12072,7 @@ As well as inside noinclude/onlyinclude
But not inside includeonly
{{subst:Foo}}
-!! html
+!! html/php
Shall not expand:
~~~~
@@ -15612,7 +15722,7 @@ evil =a=
b
-!! html
+!! html/php
=a=
-b
-
=a=
-b
-
=a=
-b
-
=a=
-b
+b
+
=a=
+b
+
=a=
+b
+
=a=
+b
+!! html/parsoid
+
=a=
+b
+
+
=a=
+b
+
+
=a=
+b
+
+
=a=
+b
!!end
!! test
Headings: 6c. Heading chars in SOL context (leading newline break)
-!! options
-parsoid
!! wikitext
a
=b=
-!! html
+!! html/php
+
a
+=b=
+
+!! html/parsoid
a
-=b=
+=b=
!!end
!! test
Headings: 6d. Heading chars in SOL context (with interspersed comments)
-!! options
-parsoid
!! wikitext
=a==a=
-!! html
-
=a=
-
=a=
+!! html/php
+
=a=
+
=a=
+
+!! html/parsoid
+
=a=
+
+
=a=
!!end
!! test
Headings: 6d. Heading chars in SOL context (No escaping needed)
!! options
parsoid=html2wt
-!! html
+!! html/parsoid
=a=
b
!! wikitext
=a=
b
@@ -21690,11 +21847,11 @@ parsoid=html2wt
Headings: 7. Insert a newline between new content and headings
!! options
parsoid=html2wt
-!! html
+!! html/parsoid
NEW
new
-
A
-
a
+
A
+
a
!! wikitext
== NEW ==
new
@@ -21723,11 +21880,17 @@ Lists: 0. Outside nests
#foo
;Foo:bar
-!! html
+!! html/php
*foo
#foo
;Foo:bar
+!! html/parsoid
+
*foo
+
+
#foo
+
+
;Foo:bar
!!end
!! test
@@ -23398,9 +23561,9 @@ Improperly nested inline or quotes tags with whitespace in between
!!test
Encapsulate protected attributes from wt
!! wikitext
-
foo
+
foo
!! html/parsoid
-
foo
+
foo
!!end
@@ -24115,9 +24278,43 @@ parsoid=html2wt
!! end
!! test
-Headings: Force sol-transparent links and behavior switches to serialize before/after
+1. Headings: Force sol-transparent links and behavior switches to serialize before/after
!! options
-parsoid=html2wt
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": false
+}
+!! html
+
hello there
+
hi pal
+
+
how goes it
+
it goes well
+
+
howdy
+
+
ok
+!! wikitext
+== hello there [[Category:A1]] ==
+
+== [[Category:A2]] hi pal ==
+
+== [[Category:A3]] how goes it ==
+
+== it goes well [[Category:A4]] ==
+
+==howdy [[Category:A5]] ==
+
+== __TOC__ ok ==
+!! end
+
+!! test
+2. Headings: Force sol-transparent links and behavior switches to serialize before/after
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
!! html
hello there
hi pal
@@ -24152,7 +24349,10 @@ __TOC__
!! test
Headings: Don't hoist metas that come from templates
!! options
-parsoid=html2wt
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
!! html
foo
!! wikitext
@@ -24162,7 +24362,10 @@ parsoid=html2wt
!! test
Headings: Category in ref isn't hoisted
!! options
-parsoid=html2wt
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
!! html
!! wikitext
== testing 123 ==
@@ -24282,6 +24495,14 @@ there ==
* foo bar baz
* foo '''bar''' baz
+
+; hi ho : hi ho
+
+: {|
+| ha
+ha
+ha
+|}
!! end
!! test
@@ -24609,6 +24830,31 @@ xhttp://cscott.netx
xhttp://cscott.netx
!! end
+!! test
+WTS of edited autolink-like text (T103364)
+!! options
+parsoid={
+ "modes": ["wt2wt"],
+ "changes": [
+ [ "span[typeof]", "removeAttr", "typeof" ]
+ ]
+}
+!! wikitext
+Not a link: http://example.com.
+!! wikitext/edited
+Not a link: http://example.com.
+!! end
+
+!! test
+WTS of newly-authored autolink-like text (T103364)
+!! options
+parsoid=html2wt
+!! html/parsoid
+
http://example.com is not a link.
+!! wikitext
+http://example.com is not a link.
+!! end
+
!! test
Edited Redirect link should emit a non-piped wikitext link
!! options
@@ -24767,7 +25013,7 @@ parsoid=html2wt
!! end
!! test
-Headings: Add space before/after == (T53744)
+1. Headings: Add space before/after == (T53744)
!! options
parsoid=html2wt
!! html
@@ -24775,9 +25021,6 @@ parsoid=html2wt
bar
baz
baz
-
-
-
ok
!! wikitext
== foo ==
@@ -24786,8 +25029,18 @@ parsoid=html2wt
== baz ==
== baz ==
+!! end
-
+!! test
+2. Headings: Add space before/after == even after hoisted content
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
+!! html
+
ok
+!! wikitext
[[Category:A2]]
== ok ==
@@ -24859,8 +25112,11 @@ parsoid={
}
!! html
hi
+
hello
!! wikitext
hi
+
+hello
!! end
!! test
@@ -24869,8 +25125,99 @@ hi
parsoid=html2wt
!! html
hi
+
hello
!! wikitext
hi
+
+ hello
+!! end
+
+!! test
+3. Indent Pre Nowiki: suppress whitespace after newlines in new paragraph or table cell
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
+!! html/parsoid
+
Foo
+ bar
+baz
+
+
Foo
+ bar
+ baz bang
+
+
foo
+ bar
+
+
foo
+ barboo
+!! wikitext
+Foo
+bar
+baz
+
+{|
+|Foo
+bar
+baz bang
+|}
+
+foo
+bar
+
+foo
+barboo
+!! end
+
+!! test
+1. New links that end in spaces
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": false
+}
+!! html
+
+!! wikitext
+[[Berlin ]]is the capital of Germany.
+
+[[Foo ]]'''bar'''
+!! end
+
+!! test
+2. New links that end in spaces
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
+!! html
+
+!! wikitext
+[[Berlin]] is the capital of Germany.
+
+[[Foo]] '''bar'''
+!! end
+
+!! test
+3. Existing links that end in spaces
+!! options
+parsoid={
+ "modes": ["html2wt"],
+ "scrubWikitext": true
+}
+!! html
+