Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377525 )
Change subject: Sync parserTests with core
......................................................................
Sync parserTests with core
Change-Id: Ia2d604cf98315100900cd055059514ed9753916e
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 34 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/25/377525/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 3cfa16b..c46a3de 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -575,7 +575,8 @@
add("html2wt", "Definition Lists: Mixed Lists: Test 6", "#*: d1\n#*::: d3\n");
add("html2wt", "Definition Lists: Mixed Lists: Test 9", "*; foo \n*: bar\n");
add("html2wt", "Definition Lists: Mixed Lists: Test 10", "*#; foo \n*#:
bar\n");
-add("html2wt", "Definition Lists: Mixed Lists: Test 11", "\n*#*#;*;; foo
:bar\n*#*#; boo :baz\n");
+add("html2wt", "Definition Lists: Mixed Lists: Test 11", "; a\n:* b\n");
+add("html2wt", "Definition Lists: Mixed Lists: Test 12", "\n*#*#;*;; foo
:bar\n*#*#; boo :baz\n");
add("html2wt", "Definition Lists: Weird Ones: Test 1", "\n*#;*::;; foo : bar
(who uses this?)\n");
add("html2wt", "Definition Lists: colons occurring in tags", "; a:b\n;
'''a:b'''\n; <i>a:b</i>\n; <span>a:b</span>\n; <div>a:b</div>\n; <div>a\n: b\n;
{{echo|a:b}}\n; {{echo|''a:b''}}\n;;; ''a:b''\n");
add("html2wt", "Definition Lists: colons and tables 1", ": {|\n| x\n|}\n\n:
{|\n| y\n|}\n");
diff --git a/tests/parserTests.json b/tests/parserTests.json
index e8e13c9..5f97421 100644
--- a/tests/parserTests.json
+++ b/tests/parserTests.json
@@ -2,8 +2,8 @@
"parserTests.txt": {
"repo": "/wikimedia/mediawiki/",
"path": "tests/parser/parserTests.txt",
- "expectedSHA1": "622c5f4412001fc13f8474330ed76b7def616208",
- "latestCommit": "c808d0aefad544910ce3cb18daaac291749cf744"
+ "expectedSHA1": "5868bd054fb3f78fcca592185d289ee734312015",
+ "latestCommit": "ea75da8eb84f38cd04cccabf7e1e408b40d56a8c"
},
"citeParserTests.txt": {
"repo": "/wikimedia/mediawiki-extensions-Cite/",
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index dc6a16b..ff777e7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4332,6 +4332,21 @@
!! end
+# This is a regression test for T175099
+# html/php+tidy is insufficient since Tidy covers up the bug.
+# But once Tidy is replaced with RemexHTML, html/php+tidy is good enough
+!! test
+Definition Lists: Mixed Lists: Test 11
+!! wikitext
+;a
+:*b
+!! html
+<dl><dt>a</dt>
+<dd>
+<ul><li>b</li></ul></dd></dl>
+
+!! end
+
# The Parsoid team disagrees with the PHP parser's seemingly-random
# rules regarding dd/dt on the next two tests. Parsoid is more
# consistent, and recognizes the shared nesting and keeps the
@@ -4339,7 +4354,7 @@
# (And tidy again converts <dt> to <dd> before 'bar'.)
!! test
-Definition Lists: Mixed Lists: Test 11
+Definition Lists: Mixed Lists: Test 12
!! wikitext
*#*#;*;;foo :bar
*#*#;boo :baz
@@ -29333,10 +29348,10 @@
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Foo_bar"><span
class="tocnumber">1</span> <span class="toctext">Foo bar</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#foo_Bar_2"><span
class="tocnumber">2</span> <span class="toctext">foo Bar</span></a></li>
-<li class="toclevel-1 tocsection-3"><a href="#%D0%A2%D0%B5%D1%81%D1%82"><span
class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-4"><a
href="#%D0%A2%D0%B5%D1%81%D1%82_2"><span class="tocnumber">4</span> <span
class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-5"><a href="#%D1%82%D0%B5%D1%81%D1%82"><span
class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
-<li class="toclevel-1 tocsection-6"><a
href="#Hey_%3C_%23_%22_%3E_%25_:_%27"><span class="tocnumber">6</span> <span
class="toctext">Hey < # " > % : '</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Тест"><span
class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Тест_2"><span
class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#тест"><span
class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
+<li class="toclevel-1 tocsection-6"><a
href="#Hey_<_#_"_>_%_:_'"><span class="tocnumber">6</span> <span
class="toctext">Hey < # " > % : '</span></a></li>
</ul>
</div>
@@ -29346,9 +29361,9 @@
<h2><span id=".D0.A2.D0.B5.D1.81.D1.82_2"></span><span class="mw-headline"
id="Тест_2">Тест</span><span class="mw-editsection"><span
class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=4" title="Edit
section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
<h2><span id=".D1.82.D0.B5.D1.81.D1.82"></span><span class="mw-headline"
id="тест">тест</span><span class="mw-editsection"><span
class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=5" title="Edit
section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
<h2><span id="Hey_.3C_.23_.22_.3E_.25_:_.27"></span><span class="mw-headline"
id="Hey_<_#_"_>_%_:_'">Hey < # " > % : '</span><span
class="mw-editsection"><span class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=6" title="Edit
section: Hey < # " > % : '">edit</a><span
class="mw-editsection-bracket">]</span></span></h2>
-<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a
href="#%D0%A2%D0%B5%D1%81%D1%82">#Тест</a> <a
href="#%D1%82%D0%B5%D1%81%D1%82">#тест</a> <a
href="#Hey_%3C_%23_%22_%3E_%25_:_%27">#Hey < # " > % : '</a>
-</p><p>%F0%9F%92%A9 <span id="%F0%9F%92%A9"></span>
-</p><p><a href="#%E5%95%A4%E9%85%92">#啤酒</a> <a
href="#%E5%95%A4%E9%85%92">#啤酒</a>
+<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a
href="#Тест">#Тест</a> <a href="#тест">#тест</a> <a
href="#Hey_<_#_"_>_%_:_'">#Hey < # " > % : '</a>
+</p><p>💩 <span id="💩"></span>
+</p><p><a href="#啤酒">#啤酒</a> <a href="#啤酒">#啤酒</a>
</p>
!! end
@@ -29427,10 +29442,10 @@
<ul>
<li class="toclevel-1 tocsection-1"><a href="#Foo_bar"><span
class="tocnumber">1</span> <span class="toctext">Foo bar</span></a></li>
<li class="toclevel-1 tocsection-2"><a href="#foo_Bar_2"><span
class="tocnumber">2</span> <span class="toctext">foo Bar</span></a></li>
-<li class="toclevel-1 tocsection-3"><a href="#%D0%A2%D0%B5%D1%81%D1%82"><span
class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-4"><a
href="#%D0%A2%D0%B5%D1%81%D1%82_2"><span class="tocnumber">4</span> <span
class="toctext">Тест</span></a></li>
-<li class="toclevel-1 tocsection-5"><a href="#%D1%82%D0%B5%D1%81%D1%82"><span
class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
-<li class="toclevel-1 tocsection-6"><a
href="#Hey_%3C_%23_%22_%3E_%25_:_%27"><span class="tocnumber">6</span> <span
class="toctext">Hey < # " > % : '</span></a></li>
+<li class="toclevel-1 tocsection-3"><a href="#Тест"><span
class="tocnumber">3</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-4"><a href="#Тест_2"><span
class="tocnumber">4</span> <span class="toctext">Тест</span></a></li>
+<li class="toclevel-1 tocsection-5"><a href="#тест"><span
class="tocnumber">5</span> <span class="toctext">тест</span></a></li>
+<li class="toclevel-1 tocsection-6"><a
href="#Hey_<_#_"_>_%_:_'"><span class="tocnumber">6</span> <span
class="toctext">Hey < # " > % : '</span></a></li>
</ul>
</div>
@@ -29440,8 +29455,8 @@
<h2><span class="mw-headline" id="Тест_2">Тест</span><span
class="mw-editsection"><span class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=4" title="Edit
section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
<h2><span class="mw-headline" id="тест">тест</span><span
class="mw-editsection"><span class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=5" title="Edit
section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
<h2><span class="mw-headline" id="Hey_<_#_"_>_%_:_'">Hey < # "
> % : '</span><span class="mw-editsection"><span
class="mw-editsection-bracket">[</span><a
href="/index.php?title=Parser_test&action=edit&section=6" title="Edit
section: Hey < # " > % : '">edit</a><span
class="mw-editsection-bracket">]</span></span></h2>
-<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a
href="#%D0%A2%D0%B5%D1%81%D1%82">#Тест</a> <a
href="#%D1%82%D0%B5%D1%81%D1%82">#тест</a> <a
href="#Hey_%3C_%23_%22_%3E_%25_:_%27">#Hey < # " > % : '</a>
-</p><p>%F0%9F%92%A9 <span id="%F0%9F%92%A9"></span>
-</p><p><a href="#%E5%95%A4%E9%85%92">#啤酒</a> <a
href="#%E5%95%A4%E9%85%92">#啤酒</a>
+<p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a
href="#Тест">#Тест</a> <a href="#тест">#тест</a> <a
href="#Hey_<_#_"_>_%_:_'">#Hey < # " > % : '</a>
+</p><p>💩 <span id="💩"></span>
+</p><p><a href="#啤酒">#啤酒</a> <a href="#啤酒">#啤酒</a>
</p>
!! end
--
To view, visit https://gerrit.wikimedia.org/r/377525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2d604cf98315100900cd055059514ed9753916e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
