jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
......................................................................
Sync parserTests with core.
This matches upstream core commit e51fe526290f9a99ab3acd3305311b94a327a4a3.
Upstream landed a urlencoding tweak
(I01556eee496e2fb540de8ff09c082c1fedddb5f7) which necessitated a sync.
Change-Id: I18813035a694f6febd9349930573d9ebd7fdd687
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 563cf18..c57919b 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -12,9 +12,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = "4717c2ba6555452bfc0525d2551b1776ec723b47";
+var expectedSHA1 = "240ed998de2f712212612f5b39bb9a393f2457ff";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "1c4a8ff314ae894a5dae23cd1c6b76b4e82bac49";
+var latestCommit = "e51fe526290f9a99ab3acd3305311b94a327a4a3";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index ea4bd57..527dd99 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1680,7 +1680,7 @@
add("html2wt", "Bug 72884: bdi element in ToC", "<div id=\"toc\"
class=\"toc\"><div id=\"toctitle\">\n== Contents ==\n</div>\n\n* [[#test|<span
class=\"tocnumber\">1</span> <span
class=\"toctext\"><bdi>test</bdi></span>]]\n\n</div>\n\n== <bdi>test</bdi>
==\n");
add("html2wt", "Empty <p> tag in TOC, removed by Sanitizer (T92892)", "\n<div
id=\"toc\" class=\"toc\">\n<div id=\"toctitle\">\n== Contents ==\n</div>\n\n*
[[#x|<span class=\"tocnumber\">1</span> <span
class=\"toctext\">x</span>]]\n\n</div>\n\n== x ==\n");
add("html2wt", "Bug 32057: Title needed when expanding <h> nodes.", "==
Headline text ==\n");
-add("html2wt", "Strip marker in urlencode", "xy\nxy\nxy\n");
+add("html2wt", "Strip marker in urlencode", "xy\nxy\nxy\nxy\n");
add("html2wt", "Strip marker in lc", "xy\n");
add("html2wt", "Strip marker in uc", "XY\n");
add("html2wt", "Strip marker in formatNum", "12\n12\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 505f874..766db1e 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -7075,7 +7075,7 @@
!! wikitext
[[Foo~bar]]
!! html/php
-<p><a href="/wiki/Foo%7Ebar" title="Foo~bar">Foo~bar</a>
+<p><a href="/wiki/Foo~bar" title="Foo~bar">Foo~bar</a>
</p>
!! html/parsoid
<p><a rel="mw:WikiLink" href="./Foo~bar" title="Foo~bar">Foo~bar</a></p>
@@ -20370,10 +20370,12 @@
{{urlencode:x<nowiki/>y}}
{{urlencode:x<nowiki/>y|wiki}}
{{urlencode:x<nowiki/>y|path}}
+{{urlencode:x<pre id="one">two</pre>y}}
!! html
<p>xy
xy
xy
+xy
</p>
!! end
--
To view, visit https://gerrit.wikimedia.org/r/223848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18813035a694f6febd9349930573d9ebd7fdd687
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
