jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397983 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
No actual changes made upstream, but record the commit hash of the
sync pushed to core.
Change-Id: I8e2504e830b89126c03b742cc3a3fc9ca52246ed
---
M tests/parserTests.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
C. Scott Ananian: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.json b/tests/parserTests.json
index 4dd04d2..7f29bdf 100644
--- a/tests/parserTests.json
+++ b/tests/parserTests.json
@@ -2,8 +2,8 @@
"parserTests.txt": {
"repo": "/wikimedia/mediawiki/",
"path": "tests/parser/parserTests.txt",
- "expectedSHA1": "201be6a42bb29089c25ff573709a40bea917fd72",
- "latestCommit": "708e8e9dee4523997a2dfe73e312db18725e782b"
+ "expectedSHA1": "075d7e0f2574f31eb97cd6b4b5a485618f1cb25b",
+ "latestCommit": "438c66d913837ab3c78edce96e96a01106057a24"
},
"citeParserTests.txt": {
"repo": "/wikimedia/mediawiki-extensions-Cite/",
--
To view, visit https://gerrit.wikimedia.org/r/397983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8e2504e830b89126c03b742cc3a3fc9ca52246ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376435 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
From core commit c808d0aefad544910ce3cb18daaac291749cf744.
A few additions to the blacklist which should probably be removed
by adding appropriate html/parsoid clauses.
Change-Id: I2b3ebc4326dedb647380048ad91447db3b5244d3
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 204 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0acc152..5ab429e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -211,6 +211,7 @@
add("wt2html", "Special parser function", "Parser
function implementation for pf_special missing in Parsoid.\nParser
function implementation for pf_special missing in Parsoid.\nParser
function implementation for pf_special missing in Parsoid.");
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
add("wt2html", "Empty table rows go away", "\n Hello\n
there\n\n\n");
+add("wt2html", "Validating that isn't eaten by tidy (T167349)", "
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376435 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
From core commit c808d0aefad544910ce3cb18daaac291749cf744.
A few additions to the blacklist which should probably be removed
by adding appropriate html/parsoid clauses.
Change-Id: I2b3ebc4326dedb647380048ad91447db3b5244d3
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 204 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/35/376435/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0acc152..5ab429e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -211,6 +211,7 @@
add("wt2html", "Special parser function", "Parser
function implementation for pf_special missing in Parsoid.\nParser
function implementation for pf_special missing in Parsoid.\nParser
function implementation for pf_special missing in Parsoid.");
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
add("wt2html", "Empty table rows go away", "\n Hello\n
there\n\n\n");
+add("wt2html", "Validating that isn't eaten by tidy (T167349)", "
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355265 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
Lots of new tests added to the blacklist from core commit
186a182a150f20475f0887cbc261d9be01dbfd98, which will be fixed
by the LanguageConverter support in Parsoid patch
https://gerrit.wikimedia.org/r/140235
One other change was made, to a Santizier test, in core commit
33e4ac5b220b0edbef6774b3d961a3313fbf76e9. Parsoid never had the
bug which is being fixed there ( confused with ).
Change-Id: I5c61781149bb8e598ccd7b6664f63cc42a346a8c
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 447 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index e595334..6887613 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -115,6 +115,14 @@
add("wt2html", "T8563: Section extraction for section suppressed by
", "\nSection 1");
add("wt2html", "2. includeonly in html attr value", "bar\nbar");
add("wt2html", "4. includeonly in table attributes", "\n\n\n");
+add("wt2html", "Preprocessor precedence 3: language converter is rightmost
opening", "hi\n\n{{-{R|echo|hi}}}-\n\n[[-{R|raw]]}-");
+add("wt2html", "Preprocessor precedence 7: broken template is rightmost
opening", "[[Foo|{{echo|Bar]]\n\nBar]]-x-y-z\n\nCareful: linktrails can move the end of
the wikilink:\ny']]all");
+add("wt2html", "Preprocessor precedence 10: groups of braces with leading
dash", "1
-{R|raw}-\n2 -
Bar-\n3
-Three-\n4 -{raw2}-\n5 - Bar-\n6 -Three-\n7
-{raw2}-");
+add("wt2html", "Preprocessor precedence 11: found during visual diff testing",
"--x\n\n--x\n\n-x");
+add("wt2html", "Preprocessor precedence 12: broken language converter closed
by brace.", "This form breaks the
template, which is unfortunate:\n
foo-{bar}bat\n\nBut if the broken language converter
markup is inside an extension\ntag, nothing bad happens:\n foo-{bar}bat\n foo-{bar}bat\n foo-{bar}bat\n foo-{bar}bat\n\n\n\n");
+add("wt2html", "Preprocessor precedence, 13: broken language converter in
external link", " http://example.com/-{foo\;
data-parsoid='{\"targetOff\":28,\"contentOffsets\":[28,42],\"dsr\":[2,43,26,1]}'>Example
in URL\n http://example.com\;
data-parsoid='{\"targetOff\":66,\"contentOffsets\":[66,96],\"dsr\":[46,97,20,1]}'>Example
in -{link} description\n http://example.com/-{foo\; about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"targetOff\":133,\"contentOffsets\":[133,157],\"dsr\":[100,160,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"[http://example.com/-{foo
Breaks template, however]\"}},\"i\":0}}]}'>Breaks template,
however");
+add("wt2html", "Preprocessor precedence, 14: broken language converter in
comment", " ...should be ok\n ...extra
dashes\n foobat ...should be
ok");
+add("wt2html", "Preprocessor precedence, 15: broken brace markup in headings",
"
\n1 foo[bar 1\n1\n2 foo[[bar 2\n2\n3 foo{bar 3\n3\n4 foo{{bar 4\n4\n5 foo{{{bar 5\n5\n6 foo-{bar 6\n6");
add("wt2html", "Templates: 2. Inside a block tag", "Foo\nFoo");
add("wt2html", "Templates: HTML Tag: 2. Generation of HTML attr. value", "foo");
add("wt2html", "Templates: HTML Tag: 3. Generation of HTML attr key and
value", "foo");
@@ -202,6 +210,8 @@
add("wt2html", "Partly disable title conversion if variant == main language
code", "-{T|zh-cn:CN;zh-tw:TW}-");
add("wt2html", "Partly disable title conversion if variant == main language
code, more", "-{T|TW}-");
add("wt2html", "Raw output of variant escape tags (R flag)", "Raw: -{R|zh:China;zh-tw:Taiwan}-");
+add("wt2html", "Nested markup inside raw output of variant escape tags (R
flag)", "Nested raw: -{R|nested
-{zh:China;zh-tw:Taiwan}- nested}-");
+add("wt2html", "Templates inside raw output of variant escape tags (R flag)",
"Nested raw: -{R|nested hi
templates}-");
add("wt2html", "Strings evaluating false shouldn't be ignored by Language
converter (T51072)", "-{zh-cn:0;zh-sg:1;zh-tw:2;zh-hk:3}-");
add("wt2html", "Conversion rules from [numeric-only string] to [something
else] (T48634)", "-{H|0=>zh-cn:B}--{H|0=>zh-cn:C;0=>zh-cn:D}--{H|0=>zh-hans:A}-012345-{A|zh-tw:0;zh-cn:E;}-012345");
add("wt2html", "Bidirectional converter rule entries with an empty value
should be ignored (T53551)", "-{H|zh-cn:foo;zh-tw:;}-foobar");
@@ -288,6 +298,11 @@
add("wt2wt", "T2553: link with two variables in a piped link",
"{|\n|[[{{{1}}}|{{{2}}}]]\n|}");
add("wt2wt", "Abort table cell attribute parsing on wikilink", "{|\n| testing
[[one|two]] | three || four\n| testing one two | three ||
four\n| testing=\"[[one|two]]\" | three || four\n|}");
add("wt2wt",
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355265 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
Lots of new tests added to the blacklist from core commit
186a182a150f20475f0887cbc261d9be01dbfd98, which will be fixed
by the LanguageConverter support in Parsoid patch
https://gerrit.wikimedia.org/r/140235
One other change was made, to a Santizier test, in core commit
33e4ac5b220b0edbef6774b3d961a3313fbf76e9. Parsoid never had the
bug which is being fixed there ( confused with ).
Change-Id: I5c61781149bb8e598ccd7b6664f63cc42a346a8c
---
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
3 files changed, 447 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/65/355265/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index e595334..6887613 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -115,6 +115,14 @@
add("wt2html", "T8563: Section extraction for section suppressed by
", "\nSection 1");
add("wt2html", "2. includeonly in html attr value", "bar\nbar");
add("wt2html", "4. includeonly in table attributes", "\n\n\n");
+add("wt2html", "Preprocessor precedence 3: language converter is rightmost
opening", "hi\n\n{{-{R|echo|hi}}}-\n\n[[-{R|raw]]}-");
+add("wt2html", "Preprocessor precedence 7: broken template is rightmost
opening", "[[Foo|{{echo|Bar]]\n\nBar]]-x-y-z\n\nCareful: linktrails can move the end of
the wikilink:\ny']]all");
+add("wt2html", "Preprocessor precedence 10: groups of braces with leading
dash", "1
-{R|raw}-\n2 -
Bar-\n3
-Three-\n4 -{raw2}-\n5 - Bar-\n6 -Three-\n7
-{raw2}-");
+add("wt2html", "Preprocessor precedence 11: found during visual diff testing",
"--x\n\n--x\n\n-x");
+add("wt2html", "Preprocessor precedence 12: broken language converter closed
by brace.", "This form breaks the
template, which is unfortunate:\n
foo-{bar}bat\n\nBut if the broken language converter
markup is inside an extension\ntag, nothing bad happens:\n foo-{bar}bat\n foo-{bar}bat\n foo-{bar}bat\n foo-{bar}bat\n\n\n\n");
+add("wt2html", "Preprocessor precedence, 13: broken language converter in
external link", " http://example.com/-{foo\;
data-parsoid='{\"targetOff\":28,\"contentOffsets\":[28,42],\"dsr\":[2,43,26,1]}'>Example
in URL\n http://example.com\;
data-parsoid='{\"targetOff\":66,\"contentOffsets\":[66,96],\"dsr\":[46,97,20,1]}'>Example
in -{link} description\n http://example.com/-{foo\; about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"targetOff\":133,\"contentOffsets\":[133,157],\"dsr\":[100,160,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"echo\",\"href\":\"./Template:Echo\"},\"params\":{\"1\":{\"wt\":\"[http://example.com/-{foo
Breaks template, however]\"}},\"i\":0}}]}'>Breaks template,
however");
+add("wt2html", "Preprocessor precedence, 14: broken language converter in
comment", " ...should be ok\n ...extra
dashes\n foobat ...should be
ok");
+add("wt2html", "Preprocessor precedence, 15: broken brace markup in headings",
"
\n1 foo[bar 1\n1\n2 foo[[bar 2\n2\n3 foo{bar 3\n3\n4 foo{{bar 4\n4\n5 foo{{{bar 5\n5\n6 foo-{bar 6\n6");
add("wt2html", "Templates: 2. Inside a block tag", "Foo\nFoo");
add("wt2html", "Templates: HTML Tag: 2. Generation of HTML attr. value", "foo");
add("wt2html", "Templates: HTML Tag: 3. Generation of HTML attr key and
value", "foo");
@@ -202,6 +210,8 @@
add("wt2html", "Partly disable title conversion if variant == main language
code", "-{T|zh-cn:CN;zh-tw:TW}-");
add("wt2html", "Partly disable title conversion if variant == main language
code, more", "-{T|TW}-");
add("wt2html", "Raw output of variant escape tags (R flag)", "Raw: -{R|zh:China;zh-tw:Taiwan}-");
+add("wt2html", "Nested markup inside raw output of variant escape tags (R
flag)", "Nested raw: -{R|nested
-{zh:China;zh-tw:Taiwan}- nested}-");
+add("wt2html", "Templates inside raw output of variant escape tags (R flag)",
"Nested raw: -{R|nested hi
templates}-");
add("wt2html", "Strings evaluating false shouldn't be ignored by Language
converter (T51072)", "-{zh-cn:0;zh-sg:1;zh-tw:2;zh-hk:3}-");
add("wt2html", "Conversion rules from [numeric-only string] to [something
else] (T48634)", "-{H|0=>zh-cn:B}--{H|0=>zh-cn:C;0=>zh-cn:D}--{H|0=>zh-hans:A}-012345-{A|zh-tw:0;zh-cn:E;}-012345");
add("wt2html", "Bidirectional converter rule entries with an empty value
should be ignored (T53551)", "-{H|zh-cn:foo;zh-tw:;}-foobar");
@@ -288,6 +298,11 @@
add("wt2wt", "T2553: link with two variables in a piped link",
"{|\n|[[{{{1}}}|{{{2}}}]]\n|}");
add("wt2wt", "Abort table cell attribute parsing on wikilink", "{|\n| testing
[[one|two]] | three || four\n| testing one two | three ||
four\n| testing=\"[[one|two]]\" | three ||
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354044 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5
---
M tests/parserTests.json
M tests/parserTests.txt
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.json b/tests/parserTests.json
index ebb2a0d..3e11b75 100644
--- a/tests/parserTests.json
+++ b/tests/parserTests.json
@@ -2,8 +2,8 @@
"parserTests.txt": {
"repo": "/wikimedia/mediawiki/",
"path": "tests/parser/parserTests.txt",
- "expectedSHA1": "b95c6136eac1a685ee499aaf59cd2f6204585804",
- "latestCommit": "ed1afdee3578bf757dc315a7cfd60525dab9dbd4"
+ "expectedSHA1": "ce0665cff572231b0a7d5cae5ef280a4322a6377",
+ "latestCommit": "f9de807e28c5194ef4e2ddbcf31375041816fab6"
},
"citeParserTests.txt": {
"repo": "/wikimedia/mediawiki-extensions-Cite/",
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 37ae227..2d107e7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -32,6 +32,7 @@
# local format section links in edit comment text as local links
# notoc disable table of contents
# thumbsize=NNN set the default thumb size to NNNpx for this test
+# wrap include the normal wrapper
(since 1.30)
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
--
To view, visit https://gerrit.wikimedia.org/r/354044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Subramanya Sastry
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354044 )
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5
---
M tests/parserTests.json
M tests/parserTests.txt
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/44/354044/1
diff --git a/tests/parserTests.json b/tests/parserTests.json
index ebb2a0d..3e11b75 100644
--- a/tests/parserTests.json
+++ b/tests/parserTests.json
@@ -2,8 +2,8 @@
"parserTests.txt": {
"repo": "/wikimedia/mediawiki/",
"path": "tests/parser/parserTests.txt",
- "expectedSHA1": "b95c6136eac1a685ee499aaf59cd2f6204585804",
- "latestCommit": "ed1afdee3578bf757dc315a7cfd60525dab9dbd4"
+ "expectedSHA1": "ce0665cff572231b0a7d5cae5ef280a4322a6377",
+ "latestCommit": "f9de807e28c5194ef4e2ddbcf31375041816fab6"
},
"citeParserTests.txt": {
"repo": "/wikimedia/mediawiki-extensions-Cite/",
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 37ae227..2d107e7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -32,6 +32,7 @@
# local format section links in edit comment text as local links
# notoc disable table of contents
# thumbsize=NNN set the default thumb size to NNNpx for this test
+# wrap include the normal wrapper
(since 1.30)
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
--
To view, visit https://gerrit.wikimedia.org/r/354044
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie87ffed05cf6e4c7b86ebd65d3d90ae859986cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334171 )
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
New failing parser tests, added to blacklist:
* T156308: We don't properly strip whitespace around interlanguage links.
* T156309: We don't support {{PAGELANGUAGE}}. (We actually need to have
the page language available for LanguageConverter.)
* T43716: LanguageConverter syntax in attributes.
There were also two changes to the html2html stored in the blacklist,
caused by a change in the localized name of the image thumbnail attribute.
This is a side-effect of Id36550e864acf0df472b6a6a12f750eb28cbdd1d.
Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 74 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 29310ae..b9eb71f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -58,6 +58,7 @@
add("wt2html", "Self-link to numeric title", "0");
add("wt2html", " inside a link", "Main Page the main page [it's not very good]");
add("wt2html", "Interlanguage link with spacing", "Blah blah blah\nhttp://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\;
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\"},\"sa\":{\"href\":\;
zh :Chinese \"},\"dsr\":[15,43,null,null]}'/>");
+add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; title=\"es:Spanish\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"isIW\":true,\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
add("wt2html", "Space and question mark encoding in interlanguage links
(T95473)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Foo%20bar?\;
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Foo%20bar?\"},\"sa\":{\"href\":\"es:Foo
bar?\"},\"dsr\":[15,30,null,null]}'/>");
add("wt2html", "2. Lists with start-of-line-transparent tokens before bullets:
Template close", "foo
bar\n*baz");
add("wt2html", "Multiple list tags generated by templates", "a\nb\nc");
@@ -93,6 +94,8 @@
add("wt2html", "Magic Word: {{REVISIONID}}", "Warning:
Page/template fetching disabled, and no cache for
Template:REVISIONID");
add("wt2html", "Magic Word: {{SCRIPTPATH}}", "/");
add("wt2html", "Magic Word: {{STYLEPATH}}", "Warning:
Page/template fetching disabled, and no cache for
Template:STYLEPATH");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}}", "Warning:
Page/template fetching disabled, and no cache for
Modèle:PAGELANGUAGE");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}} on a page with no explicitly set
language", "Warning:
Page/template fetching disabled, and no cache for
Template:PAGELANGUAGE");
add("wt2html", "Case-sensitive magic words, when cased differently, should
just be template transclusions", "Warning:
Page/template fetching disabled, and no cache for
Template:CurrentMonth\nWarning:
Page/template fetching disabled, and no cache for
Template:Currentday\nWarning:
Page/template fetching disabled, and no cache for
Template:CURreNTweEK\nWarning:
Page/template fetching disabled, and no cache for
Template:CurrentHour");
add("wt2html", "Parsoid: Template-generated DISPLAYTITLE", "");
add("wt2html", "Namespace 1 {{ns:1}}", "1");
@@ -214,6 +217,7 @@
add("wt2html", "Unidirectional converter rule entries with an empty \"from\"
string should be ignored (T53551)", "-{H|=>zh-cn:foo;}-foobar");
add("wt2html", "Empty converter rule entries shouldn't be inserted into the
conversion table (T53551)", "-{H|}-foobar");
add("wt2html", "Nested using of manual convert syntax", "Nested: -{zh-hans:Hi
-{zh-cn:China;zh-sg:Singapore;}-;zh-hant:Hello -{zh-tw:Taiwan;zh-hk:H-{ong}-
K-{}-ong;}-;}-!");
+add("wt2html", "HTML markups with conversion syntax in attribs, nested in
other conversion blocks", "-{zh;zh-hans;zh-hant|A}-");
add("wt2html", "Proper conversion of text in external links", "http://www.google.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[0,21,0,0]}'>http://www.google.com\ngopher://www.google.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[22,45,0,0]}'>gopher://www.google.com\nhttp://www.google.com\;
data-parsoid='{\"targetOff\":69,\"contentOffsets\":[69,90],\"dsr\":[46,91,23,1]}'>http://www.google.com\ngopher://www.google.com\;
data-parsoid='{\"targetOff\":117,\"contentOffsets\":[117,140],\"dsr\":[92,141,25,1]}'>gopher://www.google.com\nhttps://www.google.com\;
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334202 )
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
New failing parser tests, added to blacklist:
* T156308: We don't properly strip whitespace around interlanguage links.
* T156309: We don't support {{PAGELANGUAGE}}. (We actually need to have
the page language available for LanguageConverter.)
* T43716: LanguageConverter syntax in attributes.
There were also two changes to the html2html stored in the blacklist,
caused by a change in the localized name of the image thumbnail attribute.
This is a side-effect of Id36550e864acf0df472b6a6a12f750eb28cbdd1d.
Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576
blaclist extra
Change-Id: Ib95c4dfb27c2680873f11be823297d975b48cfea
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 74 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/02/334202/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 29310ae..b9eb71f 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -58,6 +58,7 @@
add("wt2html", "Self-link to numeric title", "0");
add("wt2html", " inside a link", "Main Page the main page [it's not very good]");
add("wt2html", "Interlanguage link with spacing", "Blah blah blah\nhttp://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\;
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/%20%20%20%20Chinese%20%20%20%20%20\"},\"sa\":{\"href\":\;
zh :Chinese \"},\"dsr\":[15,43,null,null]}'/>");
+add("wt2html", "Escaping of interlanguage links (T129218, T156308)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Spanish\; title=\"es:Spanish\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Spanish\"},\"sa\":{\"href\":\":es:Spanish\"},\"isIW\":true,\"dsr\":[15,30,2,2]}'>es:Spanish\n : zh : Chinese ");
add("wt2html", "Space and question mark encoding in interlanguage links
(T95473)", "Blah blah blah\nhttp://es.wikipedia.org/wiki/Foo%20bar?\;
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://es.wikipedia.org/wiki/Foo%20bar?\"},\"sa\":{\"href\":\"es:Foo
bar?\"},\"dsr\":[15,30,null,null]}'/>");
add("wt2html", "2. Lists with start-of-line-transparent tokens before bullets:
Template close", "foo
bar\n*baz");
add("wt2html", "Multiple list tags generated by templates", "a\nb\nc");
@@ -93,6 +94,8 @@
add("wt2html", "Magic Word: {{REVISIONID}}", "Warning:
Page/template fetching disabled, and no cache for
Template:REVISIONID");
add("wt2html", "Magic Word: {{SCRIPTPATH}}", "/");
add("wt2html", "Magic Word: {{STYLEPATH}}", "Warning:
Page/template fetching disabled, and no cache for
Template:STYLEPATH");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}}", "Warning:
Page/template fetching disabled, and no cache for
Modèle:PAGELANGUAGE");
+add("wt2html", "Magic Word: {{PAGELANGUAGE}} on a page with no explicitly set
language", "Warning:
Page/template fetching disabled, and no cache for
Template:PAGELANGUAGE");
add("wt2html", "Case-sensitive magic words, when cased differently, should
just be template transclusions", "Warning:
Page/template fetching disabled, and no cache for
Template:CurrentMonth\nWarning:
Page/template fetching disabled, and no cache for
Template:Currentday\nWarning:
Page/template fetching disabled, and no cache for
Template:CURreNTweEK\nWarning:
Page/template fetching disabled, and no cache for
Template:CurrentHour");
add("wt2html", "Parsoid: Template-generated DISPLAYTITLE", "");
add("wt2html", "Namespace 1 {{ns:1}}", "1");
@@ -214,6 +217,7 @@
add("wt2html", "Unidirectional converter rule entries with an empty \"from\"
string should be ignored (T53551)", "-{H|=>zh-cn:foo;}-foobar");
add("wt2html", "Empty converter rule entries shouldn't be inserted into the
conversion table (T53551)", "-{H|}-foobar");
add("wt2html", "Nested using of manual convert syntax", "Nested: -{zh-hans:Hi
-{zh-cn:China;zh-sg:Singapore;}-;zh-hant:Hello -{zh-tw:Taiwan;zh-hk:H-{ong}-
K-{}-ong;}-;}-!");
+add("wt2html", "HTML markups with conversion syntax in attribs, nested in
other conversion blocks", "-{zh;zh-hans;zh-hant|A}-");
add("wt2html", "Proper conversion of text in external links", "http://www.google.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[0,21,0,0]}'>http://www.google.com\ngopher://www.google.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[22,45,0,0]}'>gopher://www.google.com\nhttp://www.google.com\;
data-parsoid='{\"targetOff\":69,\"contentOffsets\":[69,90],\"dsr\":[46,91,23,1]}'>http://www.google.com\ngopher://www.google.com\;
data-parsoid='{\"targetOff\":117,\"contentOffsets\":[117,140],\"dsr\":[92,141,25,1]}'>gopher://www.google.com\nhttps://www.google.com\;
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334171 )
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 61 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/71/334171/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 52209d2..cc202ac 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -8600,6 +8600,22 @@
http://es.wikipedia.org/wiki/Foo_bar; />
!! end
+!! test
+Escaping of interlanguage links
+!! wikitext
+Blah blah blah
+[[:es:Spanish]]
+[[ : zh : Chinese ]]
+!! html/php
+Blah blah blah
+http://es.wikipedia.org/wiki/Spanish; class="extiw"
title="es:Spanish">es:Spanish
+http://zh.wikipedia.org/wiki/Chinese; class="extiw"
title="zh:Chinese"> zh : Chinese
+
+!! html/parsoid
+http://es.wikipedia.org/wiki/Spanish;
title="es:Spanish">es:Spanish
+http://zh.wikipedia.org/wiki/Chinese;
title="zh:Chinese"> zh : Chinese
+!! end
+
## parsoid html2wt will normalize the space to _
!! test
Space and question mark encoding in interlanguage links (T95473)
@@ -10296,6 +10312,26 @@
{{SITENAME}}
!! html
MediaWiki
+
+!! end
+
+!! test
+Magic Word: {{PAGELANGUAGE}}
+!! options
+language=fr
+!! wikitext
+{{PAGELANGUAGE}}
+!! html
+fr
+
+!! end
+
+!! test
+Magic Word: {{PAGELANGUAGE}} on a page with no explicitly set language
+!! wikitext
+{{PAGELANGUAGE}}
+!! html
+en
!! end
@@ -16057,7 +16093,7 @@
!! wikitext
Foo
!! html/php
-Foo
+Foo
!! html/parsoid
Foo
@@ -20678,6 +20714,28 @@
# [http://example.com http://example.com] will not RT back to that
# form anymore.
!! test
+HTML markups with conversion syntax in attribs, nested in other conversion
blocks
+!! options
+language=zh variant=zh-cn
+!! wikitext
+-{zh;zh-hans;zh-hant|A}-
+!! html
+A
+
+!! end
+
+!! test
+HTML markups with conversion syntax in attribs, nested in other conversion
blocks (not working yet)
+!! options
+language=zh variant=zh-cn disabled
+!! wikitext
+-{A}-
+!! html
+A
+
+!! end
+
+!! test
Proper conversion of text in external links
!! options
language=sr variant=sr-ec
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index f801139..90f971d 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/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 = "d358d2a1401d9d9ba06099d1f8862282acf00b87";
+var expectedSHA1 = "e356e32b279671d5c662aa4409d64425c14adb6f";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "6b97c822726c98f9b3cbc821e631dc18e52489d2";
+var latestCommit = "4a07505402a56a32be23a570f4bd1fe33dd542a9";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/334171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09b794af5a8eb83b99f90f128f1c67efabec8576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328698 )
Change subject: Sync parsertests with core
..
Sync parsertests with core
* Added html/parsoid for a new test. wt2html is sufficient
for that since the other modes will expectedly fail.
* Blacklisted the gallery failures since they are related to
language variant code. There are patches to update Parsoid
for that. Those patches will deal with these failing tests.
Change-Id: I8f24d9d55fa23d68f95ed66c26143b8bf44b1832
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 221 insertions(+), 26 deletions(-)
Approvals:
C. Scott Ananian: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 94a6bac..bb03503 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -226,9 +226,11 @@
add("wt2html", "Do not convert roman numbers to language variants", "Fridrih IV je car.");
add("wt2html", "Don't convert raw rule \"-{R|=}-\" to \"=>\"", "-{R|=>}-");
add("wt2html", "Don't break link parsing if language converter markup is in
the caption.", "-{R|main page}-");
-add("wt2html", "Don't break image parsing if language converter markup is in
the caption.", "");
+add("wt2html", "T146305: Don't break image parsing if language converter
markup is in the caption.", "caption:}-");
+add("wt2html", "T146305: Don't break image parsing if nested language
converter markup is in the caption.", "WEBLOG}-)}-");
+add("wt2html", "Don't break gallery if language converter markup is inside.",
"\nbat}-\nThis
is a test template\n");
add("wt2html", "Don't break list handling if language converter markup is in
the item.", "-{zh-cnAAA;zh-tw:BBB}-");
-add("wt2html", "Don't break table handling if language converter markup is in
the cell.", "\n\nB}-\n");
+add("wt2html", "T153140: Don't break table handling if language converter
markup is in the cell.", "\n\nB}-\n");
add("wt2html", "Bug 529: Uncovered bullet in parser function result", "
Foo bar");
add("wt2html", "Bug 5678: Double-parsed template invocation", "{{paramtest
param = hello }}");
add("wt2html", "Case insensitivity of parser functions for non-ASCII
characters (bug 8143)", "Warning:
Page/template fetching disabled, and no cache for
PRVNÍVELKÉ:ěščř\nWarning:
Page/template fetching disabled, and no cache for
Prvnívelké:ěščř\nWarning:
Page/template fetching disabled, and no cache for PRVNÍMALÉ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Prvnímalé:ěščř\nWarning:
Page/template fetching disabled, and no cache for MALÁ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Malá:ěščř\nWarning:
Page/template fetching disabled, and no cache for VELKÁ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Velká:ěščř");
@@ -258,6 +260,11 @@
add("wt2html", "Check noCommafy in formatNum", "123456.78\n123456.78");
add("wt2html", "Wrong option for formatNum (bug 56199)", "1,234.56\n1,234.56\n1234.56");
add("wt2html", "Strip marker in grammar", "Parser
function implementation for pf_grammar missing in Parsoid.");
+add("wt2html", "Gallery override link with WikiLink (bug 34852)", "\ncaption\n");
+add("wt2html", "Gallery override link with absolute external link (bug
34852)", "\nhttp://www.example.org\;>caption\n");
+add("wt2html", "Gallery override link with absolute external link with
LanguageConverter", "\nhttp://www.example.org\;>caption\n");
+add("wt2html", "Gallery override link with malicious javascript (bug 34852)",
"\ncaption\n");
+add("wt2html", "Gallery with invalid title as link (bug 43964)", "\nlink=\n");
add("wt2html", "Language parser function", "ar");
add("wt2html", "Special parser function", "Parser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.");
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
@@ -345,7 +352,7 @@
add("wt2wt", "Image with page parameter", "[[File:LoremIpsum.djvu]]\n");
add("wt2wt", "Don't fall for the self-closing div", "hello world");
add("wt2wt", "Parsing of overlapping (improperly nested) inline html tags",
"x\n");
-add("wt2wt", "Don't break table handling if language converter markup is in
the cell.", "{|\n|-\n| -{R |B}-\n|}");
+add("wt2wt", "T153140: Don't break table handling if language converter markup
is in the cell.", "{|\n|-\n| -{R |B}-\n|}");
add("wt2wt", "Bug 529: Uncovered bullet leaving empty list, normally removed
by tidy", "*** Foo \n{{bullet}}");
add("wt2wt", "HHP2.1: Heuristics for headings in preprocessor parenthetical
structures", "{{foo|\n=heading=\n");
add("wt2wt", "HHP2.2: Heuristics for headings in preprocessor parenthetical
Subramanya Sastry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328698 )
Change subject: Sync parsertests with core
..
Sync parsertests with core
* Added html/parsoid for a new test. wt2html is sufficient
for that since the other modes will expectedly fail.
* Blacklisted the gallery failures since they are related to
language variant code. There are patches to update Parsoid
for that. Those patches will deal with these failing tests.
Change-Id: I8f24d9d55fa23d68f95ed66c26143b8bf44b1832
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 221 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/98/328698/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 94a6bac..bb03503 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -226,9 +226,11 @@
add("wt2html", "Do not convert roman numbers to language variants", "Fridrih IV je car.");
add("wt2html", "Don't convert raw rule \"-{R|=}-\" to \"=>\"", "-{R|=>}-");
add("wt2html", "Don't break link parsing if language converter markup is in
the caption.", "-{R|main page}-");
-add("wt2html", "Don't break image parsing if language converter markup is in
the caption.", "");
+add("wt2html", "T146305: Don't break image parsing if language converter
markup is in the caption.", "caption:}-");
+add("wt2html", "T146305: Don't break image parsing if nested language
converter markup is in the caption.", "WEBLOG}-)}-");
+add("wt2html", "Don't break gallery if language converter markup is inside.",
"\nbat}-\nThis
is a test template\n");
add("wt2html", "Don't break list handling if language converter markup is in
the item.", "-{zh-cnAAA;zh-tw:BBB}-");
-add("wt2html", "Don't break table handling if language converter markup is in
the cell.", "\n\nB}-\n");
+add("wt2html", "T153140: Don't break table handling if language converter
markup is in the cell.", "\n\nB}-\n");
add("wt2html", "Bug 529: Uncovered bullet in parser function result", "
Foo bar");
add("wt2html", "Bug 5678: Double-parsed template invocation", "{{paramtest
param = hello }}");
add("wt2html", "Case insensitivity of parser functions for non-ASCII
characters (bug 8143)", "Warning:
Page/template fetching disabled, and no cache for
PRVNÍVELKÉ:ěščř\nWarning:
Page/template fetching disabled, and no cache for
Prvnívelké:ěščř\nWarning:
Page/template fetching disabled, and no cache for PRVNÍMALÉ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Prvnímalé:ěščř\nWarning:
Page/template fetching disabled, and no cache for MALÁ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Malá:ěščř\nWarning:
Page/template fetching disabled, and no cache for VELKÁ:ěščř\nWarning:
Page/template fetching disabled, and no cache for Velká:ěščř");
@@ -258,6 +260,11 @@
add("wt2html", "Check noCommafy in formatNum", "123456.78\n123456.78");
add("wt2html", "Wrong option for formatNum (bug 56199)", "1,234.56\n1,234.56\n1234.56");
add("wt2html", "Strip marker in grammar", "Parser
function implementation for pf_grammar missing in Parsoid.");
+add("wt2html", "Gallery override link with WikiLink (bug 34852)", "\ncaption\n");
+add("wt2html", "Gallery override link with absolute external link (bug
34852)", "\nhttp://www.example.org\;>caption\n");
+add("wt2html", "Gallery override link with absolute external link with
LanguageConverter", "\nhttp://www.example.org\;>caption\n");
+add("wt2html", "Gallery override link with malicious javascript (bug 34852)",
"\ncaption\n");
+add("wt2html", "Gallery with invalid title as link (bug 43964)", "\nlink=\n");
add("wt2html", "Language parser function", "ar");
add("wt2html", "Special parser function", "Parser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.\nParser
function implementation for pf_#special missing in Parsoid.");
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
@@ -345,7 +352,7 @@
add("wt2wt", "Image with page parameter", "[[File:LoremIpsum.djvu]]\n");
add("wt2wt", "Don't fall for the self-closing div", "hello world");
add("wt2wt", "Parsing of overlapping (improperly nested) inline html tags",
"x\n");
-add("wt2wt", "Don't break table handling if language converter markup is in
the cell.", "{|\n|-\n| -{R |B}-\n|}");
+add("wt2wt", "T153140: Don't break table handling if language converter markup
is in the cell.", "{|\n|-\n| -{R |B}-\n|}");
add("wt2wt", "Bug 529: Uncovered bullet leaving empty list, normally removed
by tidy", "*** Foo \n{{bullet}}");
add("wt2wt", "HHP2.1: Heuristics for headings in preprocessor parenthetical
structures", "{{foo|\n=heading=\n");
add("wt2wt", "HHP2.2: Heuristics for headings in preprocessor
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327286 )
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
Change-Id: I4bc976d3a861052b201ad985aac0a647999d2cc4
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 57 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 4571014..6b4288b 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -645,7 +645,6 @@
add("html2wt", "Templates: Indent-Pre: 1f: Wrapping should be based on
expanded content", " a\n\n\n\n a\n\n\n\n b\n\na\n\n b\n\na\n\n b\n");
add("html2wt", "Templates: Strip leading and trailing whitespace from
named-param values", "a\n\nb\n\nc\n\n* d\n");
add("html2wt", "Templates: Don't strip whitespace from positional-param
values", "a \n\nb \n\n c \n\n\n\n d\n\n\n\n e\n\n\n\n* f\n\n\n g\n");
-add("html2wt", "Templates: Handle empty comment-and-ws-only lines correctly",
"foo\nbar\n");
add("html2wt", "Templates: Handle comments in the target", "{{echo |foo}}\n\n{{echo |foo}}\n\n{{echo|foo}}\n\n{{echo|foo}}\n\n{{echo|foo}}");
add("html2wt", "Templates: Handle comments in parameter names (bug 67657)",
"{{echo|1 =foo}}\n\n{{echo|
1=foo}}\n\n{{echo|1=foo}}\n\n{{echo|1=foo}}");
add("html2wt", "1a. Indent-Pre and Comments", " a\n\nc\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 47401bc..07d50a8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1,5 +1,5 @@
# MediaWiki Parser test cases
-# Some taken from http://meta.wikimedia.org/wiki/Parser_testing
+# Some taken from https://meta.wikimedia.org/wiki/Parser_testing
# All (C) their respective authors and released under the GPL
#
# The syntax should be fairly self-explanatory.
@@ -539,7 +539,7 @@
!! end
# Note that the html+tidy output removes the spaces after the ,
-# which is a bug (http://sourceforge.net/p/tidy/bugs/945/, etc).
+# which is a bug (https://sourceforge.net/p/tidy/bugs/945/, etc).
# This is an issue for all tests with lists. We intentionally do
# *not* add html+tidy clauses for these, as we don't want to
# document/test the broken behavior. (Parsoid matches the non-tidy
@@ -1245,7 +1245,7 @@
!! end
# test cases taken from
-# http://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element
+# https://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element
!! test
Ruby markup (W3C-style)
!! wikitext
@@ -1308,7 +1308,7 @@
!! end
-# There is a tidy bug here: http://sourceforge.net/p/tidy/bugs/946/
+# There is a tidy bug here: https://sourceforge.net/p/tidy/bugs/946/
# If the non-word-character tag made it through the sanitizer, tidy
# would munge it up.
!! test
@@ -1433,6 +1433,15 @@
:and a colon
+!! end
+
+!! test
+Don't parse (T149622)
+!! wikitext
+
+!! html/php
+span class="error"
+
!! end
!! test
@@ -2718,10 +2727,12 @@
bar}}
-!! html
+!! html/php
foo
bar
+!! html/parsoid
+foo
bar
!! end
!! test
@@ -2741,7 +2752,14 @@
{{echo|foo}}
{{echo|foo}}
-!!html/parsoid
+!! html/php
+foo
+foo
+foo
+foo
+foo
+
+!! html/parsoid
foo
foo
@@ -2767,7 +2785,13 @@
{{echo|1=foo}}
{{echo|1=foo}}
-!!html/parsoid
+!! html/php
+foo
+foo
+foo
+foo
+
+!! html/parsoid
foo
foo
@@ -2781,11 +2805,11 @@
Templates: Other wikitext in parameter names (bug 67657)
!! wikitext
{{echo|''1''=foo}}
-!!html/parsoid
-{{{1}}}
-!!html/php
+!! html/php
{{{1}}}
+!! html/parsoid
+{{{1}}}
!!end
#
@@ -3860,7 +3884,7 @@
## All Parsoid only definition list tests have this difference.
##
## See also: https://phabricator.wikimedia.org/T8569
-## and
http://lists.wikimedia.org/pipermail/wikitext-l/2011-November/000483.html
+## and
https://lists.wikimedia.org/pipermail/wikitext-l/2011-November/000483.html
!! test
Table / list interaction: indented table with lists in table contents
@@ -5214,7 +5238,7 @@
http://www.example.com/?title=AT%26T;>http://www.example.com/?title=AT%26T
!! end
-# According to
http://www.w3.org/TR/2011/WD-html5-20110525/Overview.html#parsing-urls a plain
+# According to
https://www.w3.org/TR/2011/WD-html5-20110525/Overview.html#parsing-urls a plain
# % is actually legal in HTML5. Any change in output would need testing though.
!! test
Bug 4781, 5267: %25 in URL
@@ -5801,7 +5825,7 @@
# This should not produce as
# is the bare minimum required by the spec, see:
-#
http://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_module_Basic_Tables
+#
https://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_module_Basic_Tables
# Parsoid team replies: empty table tags are legal in HTML5
!! test
A table with no data.
@@ -7435,6
C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327286 )
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
Change-Id: I4bc976d3a861052b201ad985aac0a647999d2cc4
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 57 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/86/327286/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 4571014..6b4288b 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -645,7 +645,6 @@
add("html2wt", "Templates: Indent-Pre: 1f: Wrapping should be based on
expanded content", " a\n\n\n\n a\n\n\n\n b\n\na\n\n b\n\na\n\n b\n");
add("html2wt", "Templates: Strip leading and trailing whitespace from
named-param values", "a\n\nb\n\nc\n\n* d\n");
add("html2wt", "Templates: Don't strip whitespace from positional-param
values", "a \n\nb \n\n c \n\n\n\n d\n\n\n\n e\n\n\n\n* f\n\n\n g\n");
-add("html2wt", "Templates: Handle empty comment-and-ws-only lines correctly",
"foo\nbar\n");
add("html2wt", "Templates: Handle comments in the target", "{{echo |foo}}\n\n{{echo |foo}}\n\n{{echo|foo}}\n\n{{echo|foo}}\n\n{{echo|foo}}");
add("html2wt", "Templates: Handle comments in parameter names (bug 67657)",
"{{echo|1 =foo}}\n\n{{echo|
1=foo}}\n\n{{echo|1=foo}}\n\n{{echo|1=foo}}");
add("html2wt", "1a. Indent-Pre and Comments", " a\n\nc\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 47401bc..07d50a8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -1,5 +1,5 @@
# MediaWiki Parser test cases
-# Some taken from http://meta.wikimedia.org/wiki/Parser_testing
+# Some taken from https://meta.wikimedia.org/wiki/Parser_testing
# All (C) their respective authors and released under the GPL
#
# The syntax should be fairly self-explanatory.
@@ -539,7 +539,7 @@
!! end
# Note that the html+tidy output removes the spaces after the ,
-# which is a bug (http://sourceforge.net/p/tidy/bugs/945/, etc).
+# which is a bug (https://sourceforge.net/p/tidy/bugs/945/, etc).
# This is an issue for all tests with lists. We intentionally do
# *not* add html+tidy clauses for these, as we don't want to
# document/test the broken behavior. (Parsoid matches the non-tidy
@@ -1245,7 +1245,7 @@
!! end
# test cases taken from
-# http://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element
+# https://www.w3.org/TR/html5/text-level-semantics.html#the-ruby-element
!! test
Ruby markup (W3C-style)
!! wikitext
@@ -1308,7 +1308,7 @@
!! end
-# There is a tidy bug here: http://sourceforge.net/p/tidy/bugs/946/
+# There is a tidy bug here: https://sourceforge.net/p/tidy/bugs/946/
# If the non-word-character tag made it through the sanitizer, tidy
# would munge it up.
!! test
@@ -1433,6 +1433,15 @@
:and a colon
+!! end
+
+!! test
+Don't parse (T149622)
+!! wikitext
+
+!! html/php
+span class="error"
+
!! end
!! test
@@ -2718,10 +2727,12 @@
bar}}
-!! html
+!! html/php
foo
bar
+!! html/parsoid
+foo
bar
!! end
!! test
@@ -2741,7 +2752,14 @@
{{echo|foo}}
{{echo|foo}}
-!!html/parsoid
+!! html/php
+foo
+foo
+foo
+foo
+foo
+
+!! html/parsoid
foo
foo
@@ -2767,7 +2785,13 @@
{{echo|1=foo}}
{{echo|1=foo}}
-!!html/parsoid
+!! html/php
+foo
+foo
+foo
+foo
+
+!! html/parsoid
foo
foo
@@ -2781,11 +2805,11 @@
Templates: Other wikitext in parameter names (bug 67657)
!! wikitext
{{echo|''1''=foo}}
-!!html/parsoid
-{{{1}}}
-!!html/php
+!! html/php
{{{1}}}
+!! html/parsoid
+{{{1}}}
!!end
#
@@ -3860,7 +3884,7 @@
## All Parsoid only definition list tests have this difference.
##
## See also: https://phabricator.wikimedia.org/T8569
-## and
http://lists.wikimedia.org/pipermail/wikitext-l/2011-November/000483.html
+## and
https://lists.wikimedia.org/pipermail/wikitext-l/2011-November/000483.html
!! test
Table / list interaction: indented table with lists in table contents
@@ -5214,7 +5238,7 @@
http://www.example.com/?title=AT%26T;>http://www.example.com/?title=AT%26T
!! end
-# According to
http://www.w3.org/TR/2011/WD-html5-20110525/Overview.html#parsing-urls a plain
+# According to
https://www.w3.org/TR/2011/WD-html5-20110525/Overview.html#parsing-urls a plain
# % is actually legal in HTML5. Any change in output would need testing though.
!! test
Bug 4781, 5267: %25 in URL
@@ -5801,7 +5825,7 @@
# This should not produce as
# is the bare minimum required by the spec, see:
-#
http://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_module_Basic_Tables
+#
https://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_module_Basic_Tables
# Parsoid team replies: empty table tags are legal in HTML5
!! test
A table with
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314455
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Added /php for the two tests with the comment options
* Removed a newline at the beginning of a test title
* Newly failing tests are part of categories of tests that need to be
systematically fixed up with /parsoid sections, __TOC__ and
definition lists, so punting on that for now.
Change-Id: I032084de3cc47a22b914e5350ebbe79e9c1b9c1a
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 66 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/55/314455/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index dab2091..17c577e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -597,6 +597,7 @@
add("html2html", "Multiple tags in TOC", "\n\n\n Contents \n\n\n 1 Foo Bar\n 2 Foo
Bar\n\n\n\n Foo Bar \n\n Foo \n\nBar\n\n[[/index.php?title=Parser_testaction=editsection=2
edit]]\n");
add("html2html", "span tags with directionality in TOC", "\n Contents \n\n\n 1 C++\n 2 זבנג!\n 3 The attributes on these
span tags must be deleted from the TOC\n 4 All attributes on these
span tags must be deleted from the TOC\n 5 Attributes after dir
on these span tags must be deleted from the
TOC\n\n\n\n C++[[/index.php?title=Parser_testaction=editsection=1
edit]]
\n\n זבנג![[/index.php?title=Parser_testaction=editsection=2
edit]]
\n\n The attributes on
these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=3
edit]]
\n\n All attributes on
these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=4
edit]]
\n\n Attributes after dir
on these span tags must be deleted from the TOC[[/index.php?title=Parser_testaction=editsection=5
edit]]
\n");
add("html2html", "Bug 72884: bdi element in ToC", "\n Contents \n\n\n 1 test\n\n\n\n test \n");
+add("html2html", "T35715: s/strike element in ToC", "\n Contents \n\n\n 1 test test test\n\n\n\n test test test \n");
add("html2html", "Empty tag in TOC, removed by Sanitizer (T92892)",
"\n\n\n Contents \n\n\n 1 x\n\n\n\n x \n");
add("html2html", "nowiki inside link inside heading (bug 18295)", " xyz
\n");
add("html2html", "new support for bdi element (bug 31817)", "ולדימיר לנין (ברוסית: Владимир Ленин, 24
באפריל 1870–22 בינואר 1924) הוא מנהיג פוליטי קומוניסטי רוסי.\n");
@@ -699,7 +700,8 @@
add("html2wt", "Definition lists: self-closed tag", "; onetwo \n: two-line
fun\n");
add("html2wt", "Bug 11748: Literal closing tags", "\n; test 1\n: test test
test test test\n; test 2\n: test test test test test\n");
add("html2wt", "Definition and unordered list using wiki syntax nested in
unordered list using html tags.", "\n*; term \n*: description\n** unordered\n");
-add("html2wt", "\nDefinition list with empty definition and following
paragraph", "; term\n:\nParagraph text\n");
+add("html2wt", "Definition list with empty definition and following
paragraph", "; term\n:\nParagraph text\n");
+add("html2wt", "Nested definition lists using html syntax", "; x\n: a\n: b\n");
add("html2wt", "Definition Lists: No nesting: Multiple dd's", "; x\n: a\n:
b\n");
add("html2wt", "Definition Lists: Indentation: Regular", ": i1\n:: i2\n:::
i3\n");
add("html2wt", "Definition Lists: Indentation: Missing 1st level", ":: i2\n:::
i3\n");
@@ -1241,6 +1243,7 @@
add("html2wt", "Multiple tags in TOC", "\n\n\n== Contents ==\n\n\n* [[#Foo_Bar|1 ''Foo''
'''Bar''']]\n* [[#Foo_Bar_2|2 ''Foo'' Bar]]\n\n\n\n== ''Foo'' '''Bar'''
==\n\n== ''Foo'' ==\n\nBar\n\n[[/index.php?title=Parser_test=edit=2
edit]]\n");
add("html2wt", "span tags with directionality in TOC", "\n== Contents ==\n\n\n*
[[#C.2B.2B|1 C++]]\n* [[#.D7.96.D7.91.D7.A0.D7.92.21|2 זבנג!]]\n*
[[#The_attributes_on_these_span_tags_must_be_deleted_from_the_TOC|3 The attributes on
these span tags must be deleted from the TOC]]\n*
[[#All_attributes_on_these_span_tags_must_be_deleted_from_the_TOC|4 All attributes on
these span tags must be deleted from the TOC]]\n*
[[#Attributes_after_dir_on_these_span_tags_must_be_deleted_from_the_TOC|5 Attributes after dir on these span tags must be deleted from the
TOC]]\n\n\n\n== C++[[/index.php?title=Parser_test=edit=1
edit]] ==\n\n== זבנג![[/index.php?title=Parser_test=edit=2
edit]] ==\n\n== The attributes on these span tags must be deleted
from the TOC[[/index.php?title=Parser_test=edit=3
edit]] ==\n\n== All attributes on these span tags must
be deleted from the TOC[[/index.php?title=Parser_test=edit=4
edit]] ==\n\n== Attributes after dir on these span
tags must be deleted from the TOC[[/index.php?title=Parser_test=edit=5
edit]] ==\n");
add("html2wt", "Bug 72884: bdi element in ToC", "\n== Contents
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
* Added a html/parsoid section to one of the newly synced test.
* Not added a html/parsoid section to the other one -- new test
needs to be investigated if it needs one.
Change-Id: I3ced26aa737da3e85ea3464fff4110def8450730
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 27 insertions(+), 2 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 09e6090..fb65143 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -27222,3 +27222,28 @@
b
!! end
+
+!! test
+Thumbnail output
+!! wikitext
+[[File:Thumb.png|thumb]]
+!! html/php+tidy
+
+http://example.com/images/e/ea/Thumb.png; width="135" height="135"
class="thumbimage" />
+
+
+
+
+
+!! end
+
+!! test
+unclosed internal link XSS (T137264)
+!! wikitext
+[[#%3Cscript%3Ealert(1)%3C/script%3E|
+!! html/php
+[[#scriptalert(1)/script|
+
+!! html/parsoid
+[[#%3Cscript%3Ealert(1)%3C/script%3E|
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 416f015..9d63e23 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/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 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
+var expectedSHA1 = "32b7e90c37dcf24b2f639d0a1d8def37f317fa3d";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
+var latestCommit = "b92a94b52f8e30c53794123961f79315adf80a55";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/306475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ced26aa737da3e85ea3464fff4110def8450730
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: Cscott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306475
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
* Added a html/parsoid section to one of the newly synced test.
* Not added a html/parsoid section to the other one -- new test
needs to be investigated if it needs one.
Change-Id: I3ced26aa737da3e85ea3464fff4110def8450730
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 27 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/75/306475/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 09e6090..fb65143 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -27222,3 +27222,28 @@
b
!! end
+
+!! test
+Thumbnail output
+!! wikitext
+[[File:Thumb.png|thumb]]
+!! html/php+tidy
+
+http://example.com/images/e/ea/Thumb.png; width="135" height="135"
class="thumbimage" />
+
+
+
+
+
+!! end
+
+!! test
+unclosed internal link XSS (T137264)
+!! wikitext
+[[#%3Cscript%3Ealert(1)%3C/script%3E|
+!! html/php
+[[#scriptalert(1)/script|
+
+!! html/parsoid
+[[#%3Cscript%3Ealert(1)%3C/script%3E|
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 416f015..9d63e23 100755
--- a/tools/fetch-parserTests.txt.js
+++ b/tools/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 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
+var expectedSHA1 = "32b7e90c37dcf24b2f639d0a1d8def37f317fa3d";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
+var latestCommit = "b92a94b52f8e30c53794123961f79315adf80a55";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/306475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ced26aa737da3e85ea3464fff4110def8450730
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
![](\"./File:Foobar.jpg\")
