jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358429 )
Change subject: Sync up with Parsoid parserTests.txt ...................................................................... Sync up with Parsoid parserTests.txt This now aligns with Parsoid commit 108eed81b3eb78b77ade5ba5daac71fb43fff6de Change-Id: Ib2b31f008adaf16866de16ef963bc58d6cabb088 --- M tests/parser/parserTests.txt 1 file changed, 91 insertions(+), 17 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 69fee30..0247dd7 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -8302,6 +8302,21 @@ !! end !! test +Serialization of purely hash wikilink +!! options +title=[[User:Test/123]] +subpage +parsoid=html2wt +!! html/parsoid +<p><a href="#a">[[</a></p> +!! wikitext +[[#a|<nowiki>[[</nowiki>]] +!! html/php +<p><a href="#a">[[</a> +</p> +!! end + +!! test 1. Interaction of linktrail and template encapsulation !! wikitext {{echo|[[Foo]]}}l @@ -17896,6 +17911,19 @@ !! end !! test +Sanitizer: Strip comments from CSS attributes +!! options +parsoid=wt2html,wt2wt +!! wikitext +<span style="margin:/*negate mbox-text padding */-0.125em -0.45em; /*rainbow*/rgba(255, 0, 0, 0.3)">2013</span> +!! html/php +<p><span style="margin: -0.125em -0.45em; rgba(255, 0, 0, 0.3)">2013</span> +</p> +!! html/parsoid +<p><span style="margin: -0.125em -0.45em; rgba(255, 0, 0, 0.3)">2013</span></p> +!! end + +!! test Language converter: output gets cut off unexpectedly (T7757) !! options language=zh @@ -23420,26 +23448,26 @@ <meta typeof="mw:Extension/LabeledSectionTransclusion/end" content="2014-04-10 (MW 1.23wmf22)"/></p> !! end -## The unconventional output is the result of `usePHPPreProcessor` being -## disabled in parserTests.js. This test is mainly just to show <section> is -## recognized as an extension tag w/o a native handler. !! test LST Sections: Newfangled approach !! wikitext <section begin="2011-05-16" /> <section end="2014-04-10 (MW 1.23wmf22)" /> !! html/parsoid -<p><span typeof="mw:Error mw:Extension/section" about="#mwt1" data-mw='{"name":"section","attrs":{"begin":"2011-05-16"},"body":null,"errors":[{"key":"mw-api-extexpand-error","message":"Could not expand extension source."}]}'><section begin="2011-05-16" /></span> -<span typeof="mw:Error mw:Extension/section" about="#mwt2" data-mw='{"name":"section","attrs":{"end":"2014-04-10 (MW 1.23wmf22)"},"body":null,"errors":[{"key":"mw-api-extexpand-error","message":"Could not expand extension source."}]}'><section end="2014-04-10 (MW 1.23wmf22)" /></span></p> +<p><span typeof="mw:Extension/section" about="#mwt4" data-mw='{"name":"section","attrs":{"begin":"2011-05-16"},"body":null}'> +</span> +<span typeof="mw:Extension/section" about="#mwt6" data-mw='{"name":"section","attrs":{"end":"2014-04-10 (MW 1.23wmf22)"},"body":null}'> +</span></p> !! end #--------- Test stripping of empty nodes in template content ---------- -!!test + +!! test Empty LI and TR nodes should be stripped from template content -!!wikitext +!! wikitext {{EmptyLITest}} {{EmptyTRTest}} -!!html/parsoid +!! html/parsoid <ul about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"EmptyLITest","href":"./Template:EmptyLITest"},"params":{},"i":0}}]}'> <li>a</li> <li>b</li> @@ -23454,11 +23482,11 @@ </tr> </tbody> </table> -!!end +!! end -!!test +!! test Empty LI and TR nodes should not be stripped from top-level content -!!wikitext +!! wikitext * a * * b @@ -23467,7 +23495,7 @@ |- |foo |} -!!html/parsoid +!! html/parsoid <ul> <li> a</li> <li></li> @@ -23481,20 +23509,20 @@ </tr> </tbody> </table> -!!end +!! end -!!test +!! test Empty TR nodes should not be stripped if they have any attributes set -!!wikitext +!! wikitext {{EmptyTRWithHTMLAttrTest}} -!!html/parsoid +!! html/parsoid <table about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"EmptyTRWithHTMLAttrTest","href":"./Template:EmptyTRWithHTMLAttrTest"},"params":{},"i":0}}]}'> <tr align="center"></tr> <tr><td>foo</td></tr> <tr align="center"></tr> <tr><td>bar</td></tr> </table> -!!end +!! end #### ---------------------------------------------------------------- #### The following section of tests are primarily to test @@ -25911,6 +25939,41 @@ [[Foo]] !! end +!! test +Parsoid should accept interwiki shortcuts +!! options +parsoid=html2wt +!! html/parsoid +<p><a rel='mw:WikiLink' href='./fr:Foo'>Foo</a> +<a rel='mw:ExtLink' href='./fr:Foo'>Foo</a> +<a href='./fr:Foo'>Foo</a></p> +<p><a rel='mw:WikiLink' href='fr%3AFoo'>Foo</a> +<a rel='mw:ExtLink' href='fr%3AFoo'>Foo</a> +<a href='fr%3AFoo'>Foo</a></p> +!! wikitext +[[:fr:Foo|Foo]] +[[:fr:Foo|Foo]] +[[:fr:Foo|Foo]] + +[[:fr:Foo|Foo]] +[[:fr:Foo|Foo]] +[[:fr:Foo|Foo]] +!! end + +!! test +Parsoid should not accept invalid interwiki shortcuts +!! options +parsoid=html2wt +!! html/parsoid +<p><a rel='mw:WikiLink' href='news:Foo'>Foo</a> +<a rel='mw:ExtLink' href='news:Foo'>Foo</a> +<a href='news:Foo'>Foo</a></p> +!! wikitext +[news:Foo Foo] +[news:Foo Foo] +[news:Foo Foo] +!! end + # See T93839 !! test New wikilinks should be serialized properly @@ -28082,6 +28145,17 @@ <span name="foo"></span> !! end +!! test +New transclusion added after a list should be serialized after the list +!! options +parsoid=html2wt +!! html/parsoid +<ul><li>a</li></ul><span about="#mwt1" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:echo"},"params":{"1":{"wt":"foo"}},"i":0}}]}'>foo</span> +!! wikitext +* a +{{echo|foo}} +!! end + # ----------------------------------------------------------------- # End of section for Parsoid-only html2wt tests for serialization # of new content -- To view, visit https://gerrit.wikimedia.org/r/358429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2b31f008adaf16866de16ef963bc58d6cabb088 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: C. Scott Ananian <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