jenkins-bot has submitted this change and it was merged.
Change subject: Sync up with Parsoid parserTests.
......................................................................
Sync up with Parsoid parserTests.
This now aligns with Parsoid commit d206ffe4026dcbce9ef27f1546d023a7027ea7e9
Change-Id: I9f7f0ddf87bf3ee14a1929599e72c5d837e15fbf
---
M tests/parser/parserTests.txt
1 file changed, 19 insertions(+), 28 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index e2d4f14..691113d 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -1540,9 +1540,9 @@
<span typeof="mw:Transclusion"
data-mw="{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"a
}"}},"i":0}}]}" about="#mwt5"></span></p>
!! wikitext
{{echo|a [ b}}
-{{echo|a <nowiki>}}</nowiki> b}}
+{{echo|<nowiki>a }} b</nowiki>}}
{{echo|<nowiki>a [[ b</nowiki>}}
-{{echo|a {{!}} <nowiki>{{ ]]</nowiki>}}
+{{echo|<nowiki>a | {{ ]]</nowiki>}}
{{echo|a <nowiki>}</nowiki>}}
!! end
@@ -10274,7 +10274,7 @@
!! wikitext
{{echo|{{ }}}}
!! html/parsoid
-<p><span typeof="mw:Transclusion mw:Nowiki" about="#mwt1"
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"{{
}}"}},"i":0}}]}'>{{ }}</span></p>
+<p about="#mwt1" typeof="mw:Transclusion" data-parsoid='{"pi":[[{"k":"1"}]]}'
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"{{
}}"}},"i":0}}]}'>{{ }}</p>
!! end
!! article
@@ -13844,6 +13844,17 @@
!! html/parsoid
<figure class="mw-default-size mw-halign-left" typeof="mw:Image/Thumb"><a
href="Foo"><img resource="./Archivo:Foobar.jpg"
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg"
data-file-width="1941" data-file-height="220" data-file-type="bitmap"
height="25" width="220"/></a><figcaption>caption</figcaption></figure>
+!! end
+
+!! test
+Localized image handling (3).
+!! options
+language=fa
+parsoid=html2wt
+!! html/parsoid
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg"
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg"
data-file-width="1941" data-file-height="220" data-file-type="bitmap"
height="25" width="220"/></a></figure>
+!! wikitext
+[[File:Foobar.jpg|بندانگشتی]]
!! end
!! test
@@ -21787,7 +21798,7 @@
<references />
!! html/parsoid
-<p>A <span about="#mwt2" class="mw-ref" id="cite_ref-1" rel="dc:references"
typeof="mw:Extension/ref"
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
href="#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span> B
C<span typeof="mw:Nowiki">}}</span></p>
+<p>A <span about="#mwt2" class="mw-ref" id="cite_ref-1" rel="dc:references"
typeof="mw:Extension/ref"
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
href="#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span> B
C}}</p>
<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4"
data-mw='{"name":"references","attrs":{}}'>
<li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1"
rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span
id="mw-reference-text-cite_note-1" class="mw-reference-text">foo
{{echo|</span></li>
</ol>
@@ -22130,8 +22141,8 @@
# This test only works in wt2html now as the <references /> 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 <references /> in
-# wt2wt.
+# here to ensure that unrelated changes don't add the new <references />
+# when selser is active.
!! test
References: 9. Generate missing references list at the end
!! wikitext
@@ -22139,10 +22150,10 @@
B <ref group="inexistent">bar</ref>
!! html/parsoid
<p>A <span class="mw-ref" id="cite_ref-1" rel="dc:references"
typeof="mw:Extension/ref"
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a
href="#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span> B
<span class="mw-ref" id="cite_ref-2" rel="dc:references"
typeof="mw:Extension/ref"
data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-2"},"attrs":{"group":"inexistent"}}'><a
href="#cite_note-2" data-mw-group="inexistent"><span
class="mw-reflink-text">[inexistent 1]</span></a></span></p>
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5"
data-mw='{"name":"references","attrs":{}}'>
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt5"
data-mw='{"name":"references","attrs":{},"autoGenerated":true}'>
<li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1"
rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span
id="mw-reference-text-cite_note-1" class="mw-reference-text">foo</span></li>
</ol>
-<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6"
data-mw-group="inexistent"
data-mw='{"name":"references","attrs":{"group":"inexistent"}}'>
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6"
data-mw-group="inexistent"
data-mw='{"name":"references","attrs":{"group":"inexistent"},"autoGenerated":true}'>
<li about="#cite_note-2" id="cite_note-2"><a href="#cite_ref-2"
data-mw-group="inexistent" rel="mw:referencedBy"><span
class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-2"
class="mw-reference-text">bar</span></li>
</ol>
!! end
@@ -24042,26 +24053,6 @@
</td><td style="color: red">Bar
</td></tr></tbody></table>
-!! end
-
-!! test
-2. Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug
42353)
-!! options
-parsoid
-!! wikitext
-{{}}
-!! html
-{{}}
-!! end
-
-!! test
-1. Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug
42353)
-!! options
-parsoid
-!! wikitext
-}}{{
-!! html
-}}{{
!! end
!!test
--
To view, visit https://gerrit.wikimedia.org/r/281774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f7f0ddf87bf3ee14a1929599e72c5d837e15fbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
