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 e2aa4e4159b9c7b5350567f26f5f14780843a368
Change-Id: I64b4e901ece0e66011b5110312885fab9c8b9cb8
---
M tests/parser/parserTests.txt
1 file changed, 15 insertions(+), 3 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 266b2b0..9d46b12 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -13333,7 +13333,7 @@
!! wikitext
[[File:Foobar.jpg|<nowiki>text with a [[MeatBall:Link|link]] in it</nowiki>]]
!! html/parsoid
-<p><span class="mw-default-size" typeof="mw:Image mw:Placeholder"
data-mw='{"caption":"<span typeof=\"mw:Nowiki\">text with a
[[MeatBall:Link|link]] in it</span>"}'><a href="./File:Foobar.jpg"><img
resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
data-file-width="1941" data-file-height="220" data-file-type="bitmap"
height="220" width="1941"/></a></span></p>
+<p><span class="mw-default-size" typeof="mw:Image"
data-mw='{"caption":"<span typeof=\"mw:Nowiki\"
data-parsoid=\"{&quot;dsr&quot;:[18,75,8,9]}\">text with a
[[MeatBall:Link|link]] in it</span>"}'><a href="./File:Foobar.jpg"><img
resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg"
data-file-width="1941" data-file-height="220" data-file-type="bitmap"
height="220" width="1941"/></a></span></p>
!! end
!! test
@@ -13756,6 +13756,18 @@
bar</p>
!! end
+## Edge case bug in Parsoid
+!! test
+T93580: Templated <ref> inside images
+!! wikitext
+[[File:Foobar.jpg|thumb|Caption with templated ref: {{echo|<ref>foo</ref>}}]]
+
+<references />
+!! html/parsoid
+<figure class="mw-default-size" typeof="mw:Image/Thumb"
data-parsoid='{"optList":[{"ck":"thumbnail","ak":"thumb"},{"ck":"caption","ak":"Caption
with templated ref: {{echo|<ref>foo</ref>}}"}]}'><a
href="./File:Foobar.jpg"
data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><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"
data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"25","width":"220"},"sa":{"resource":"File:Foobar.jpg"}}'/></a><figcaption>Caption
with templated ref: <span about="#mwt5" class="mw-ref" id="cite_ref-1"
rel="dc:references" typeof="mw:Transclusion mw:Extension/ref"
data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"<ref>foo</ref>"}},"i":0}}]}'><a
href="#cite_note-1" style="counter-reset: mw-Ref 1;"><span
class="mw-reflink-text">[1]</span></a></span></figcaption></figure>
+
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6"
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" data-parsoid="{}">foo</span></li></ol>
+!! end
###
### Subpages
@@ -24572,7 +24584,7 @@
"scrubWikitext": true
}
!! html/parsoid
-<h2> foo <span about="#mwt2" class="reference" 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">[1]</a></span> </h2>
+<h2> foo <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> </h2>
<ol class="references" typeof="mw:Extension/references" about="#mwt3"
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1"
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span>
<span id="mw-reference-text-cite_note-1" class="mw-reference-text">bar <link
rel="mw:PageProp/Category" href="./Category:Baz" /> </span></li></ol>
!! wikitext
@@ -24662,7 +24674,7 @@
<h2> hi <span about="#mwt1" typeof="mw:Transclusion"
data-mw='{"parts":[{"template":{"target":{"wt":"bogus","href":"./Template:Bogus"},"params":{"1":{"wt":"there\nyou"}},"i":0}}]}'>there</span><span
about="#mwt1">
</span><span about="#mwt1">you</span> </h2>
-<h2> foo <span about="#mwt2" class="reference" 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">[1]</a></span> </h2>
+<h2> foo <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> </h2>
<ol class="references" typeof="mw:Extension/references" about="#mwt3"
data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1"
id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span>
<span id="mw-reference-text-cite_note-1" class="mw-reference-text"
data-parsoid="{}">hello
there</span></li></ol>
--
To view, visit https://gerrit.wikimedia.org/r/232407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I64b4e901ece0e66011b5110312885fab9c8b9cb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
