[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 790f276..f4a03d8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -18858,7 +18858,7 @@
Nonexistent.jpg
-Nonexistent.jpg
+Nonexistent.jpg
caption
@@ -18866,14 +18866,14 @@
Nonexistent.jpg
-Nonexistent.jpg
+Nonexistent.jpg
http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
-Foobar.jpg
+Foobar.jpg
some caption Main Page
@@ -18881,7 +18881,7 @@
http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
-Foobar.jpg
+Foobar.jpg
@@ -27121,8 +27121,8 @@
!! html/php+tidy
a
-
-
+
+
b
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 68000ab..416f015 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 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
+var expectedSHA1 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
+var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/299700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299700
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/00/299700/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 790f276..f4a03d8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -18858,7 +18858,7 @@
Nonexistent.jpg
-Nonexistent.jpg
+Nonexistent.jpg
caption
@@ -18866,14 +18866,14 @@
Nonexistent.jpg
-Nonexistent.jpg
+Nonexistent.jpg
http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
-Foobar.jpg
+Foobar.jpg
some caption Main Page
@@ -18881,7 +18881,7 @@
http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
-Foobar.jpg
+Foobar.jpg
@@ -27121,8 +27121,8 @@
!! html/php+tidy
a
-
-
+
+
b
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 68000ab..416f015 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 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
+var expectedSHA1 = "7baf1dfcb3e2315e586b14542acea8fbda38e15b";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
+var latestCommit = "9526a4bb6630fce432f3922d9fb2c16f4237d136";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/299700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc442bc6561ca334bc87d48f1d74d2a1ad5e6132
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
Change-Id: I49f79b77594c1b4e69cbe7afec1f91e8ff985120
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 19c9f9a..81ae363 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -934,7 +934,7 @@
add("html2wt", "BUG 41: Template parameters shown as broken links",
"{{{parameter}}}\n");
add("html2wt", "Template with targets containing wikilinks",
"{{[[wiki/Foo|foo]]}}\n\n{{[[wiki/Foo|foo]]}}\n\n{{[[foo}}]]\n");
add("html2wt", "int keyword", "You have lots of money (not!).\n");
-add("html2wt", "int keyword - non-existing message",
"\n");
+add("html2wt", "int keyword - non-existing message", "⧼var⧽\n");
add("html2wt", " and being included", "Foobar\n");
add("html2wt", " being included", "Foo\n");
add("html2wt", " and being included", "Foo\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fb27146..f45c666 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -11024,7 +11024,7 @@
!! wikitext
{{int:var}}
!! html
-var
+⧼var⧽
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index c763927..68000ab 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 = "4bdc214a83d57881c30c1a18f47fc85957f0059a";
+var expectedSHA1 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "32a2661a56db1be717ce431c67260bbea771558f";
+var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/296924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49f79b77594c1b4e69cbe7afec1f91e8ff985120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296924
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
Change-Id: I49f79b77594c1b4e69cbe7afec1f91e8ff985120
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/24/296924/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 19c9f9a..81ae363 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -934,7 +934,7 @@
add("html2wt", "BUG 41: Template parameters shown as broken links",
"{{{parameter}}}\n");
add("html2wt", "Template with targets containing wikilinks",
"{{[[wiki/Foo|foo]]}}\n\n{{[[wiki/Foo|foo]]}}\n\n{{[[foo}}]]\n");
add("html2wt", "int keyword", "You have lots of money (not!).\n");
-add("html2wt", "int keyword - non-existing message",
"\n");
+add("html2wt", "int keyword - non-existing message", "⧼var⧽\n");
add("html2wt", " and being included", "Foobar\n");
add("html2wt", " being included", "Foo\n");
add("html2wt", " and being included", "Foo\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fb27146..f45c666 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -11024,7 +11024,7 @@
!! wikitext
{{int:var}}
!! html
-var
+⧼var⧽
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index c763927..68000ab 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 = "4bdc214a83d57881c30c1a18f47fc85957f0059a";
+var expectedSHA1 = "82b1c56d0a15db33b13e3bc1a1f7f9c817e0863c";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "32a2661a56db1be717ce431c67260bbea771558f";
+var latestCommit = "6cff81981569412ec779495370dfe9566cc175c9";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/296924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49f79b77594c1b4e69cbe7afec1f91e8ff985120
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I714f87ad46d99aa9925ce0e654aa8da45cf08b73
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 9f2973c..c302113 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -881,7 +881,7 @@
add("html2wt", "Magic Word: {{TALKPAGENAMEE}}",
"User_talk:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason\n");
add("html2wt", "Magic Word: {{SUBJECTPAGENAME}}", "User:Ævar Arnfjörð
Bjarmason\n");
add("html2wt", "Magic Word: {{SUBJECTPAGENAMEE}}",
"User:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason\n");
-add("html2wt", "Magic Word: {{NUMBEROFFILES}}", "6\n");
+add("html2wt", "Magic Word: {{NUMBEROFFILES}}", "7\n");
add("html2wt", "Magic Word: {{PAGENAME}}", "Ævar Arnfjörð Bjarmason\n");
add("html2wt", "Magic Word: {{PAGENAME}} with metacharacters",
"'''foo & bar = baz'''\n");
add("html2wt", "Magic Word: {{PAGENAME}} with metacharacters (bug 26781)",
"*RFC 1234
http://example.com/\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index afd06ca..2e059d7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -9944,7 +9944,7 @@
!! wikitext
{{NUMBEROFFILES}}
!! html
-6
+7
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 693b45a..c763927 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 = "072f3924d1666914099d4a6bb88c2715f3184b7f";
+var expectedSHA1 = "4bdc214a83d57881c30c1a18f47fc85957f0059a";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "35477b6e3aa156c99f9ed905e2b10a01de12267b";
+var latestCommit = "32a2661a56db1be717ce431c67260bbea771558f";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/294362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I714f87ad46d99aa9925ce0e654aa8da45cf08b73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/294362
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I714f87ad46d99aa9925ce0e654aa8da45cf08b73
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/62/294362/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 9f2973c..c302113 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -881,7 +881,7 @@
add("html2wt", "Magic Word: {{TALKPAGENAMEE}}",
"User_talk:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason\n");
add("html2wt", "Magic Word: {{SUBJECTPAGENAME}}", "User:Ævar Arnfjörð
Bjarmason\n");
add("html2wt", "Magic Word: {{SUBJECTPAGENAMEE}}",
"User:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason\n");
-add("html2wt", "Magic Word: {{NUMBEROFFILES}}", "6\n");
+add("html2wt", "Magic Word: {{NUMBEROFFILES}}", "7\n");
add("html2wt", "Magic Word: {{PAGENAME}}", "Ævar Arnfjörð Bjarmason\n");
add("html2wt", "Magic Word: {{PAGENAME}} with metacharacters",
"'''foo & bar = baz'''\n");
add("html2wt", "Magic Word: {{PAGENAME}} with metacharacters (bug 26781)",
"*RFC 1234
http://example.com/\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index afd06ca..2e059d7 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -9944,7 +9944,7 @@
!! wikitext
{{NUMBEROFFILES}}
!! html
-6
+7
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 693b45a..c763927 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 = "072f3924d1666914099d4a6bb88c2715f3184b7f";
+var expectedSHA1 = "4bdc214a83d57881c30c1a18f47fc85957f0059a";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "35477b6e3aa156c99f9ed905e2b10a01de12267b";
+var latestCommit = "32a2661a56db1be717ce431c67260bbea771558f";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/294362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I714f87ad46d99aa9925ce0e654aa8da45cf08b73
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I6f08aba0044e1ce16a4a092bf314fb9713f0ef2f
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 4f6e32d..1f1d53b 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4783,6 +4783,15 @@
!! end
!! test
+External links: nofollow domain exception
+!! wikitext
+A [https://no-nofollow.org/foobar link], and another [https://example.org
link].
+!! html
+A https://no-nofollow.org/foobar;>link,
and another https://example.org;>link.
+
+!!end
+
+!! test
External image
!! wikitext
External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
@@ -20730,7 +20739,6 @@
!! html/php
Screen
this is not the the title
-Warning: Display title "whatever" was
ignored since it is not equivalent to the page's actual title.
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 3609ac3..693b45a 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 = "be5e77d810f96f8664631bb48f416e53a56f9cbf";
+var expectedSHA1 = "072f3924d1666914099d4a6bb88c2715f3184b7f";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "20bdcc7620c34f55f1aa1ec55c6e19eee7a6cd3c";
+var latestCommit = "35477b6e3aa156c99f9ed905e2b10a01de12267b";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/292601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f08aba0044e1ce16a4a092bf314fb9713f0ef2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292601
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I6f08aba0044e1ce16a4a092bf314fb9713f0ef2f
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/01/292601/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 4f6e32d..1f1d53b 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4783,6 +4783,15 @@
!! end
!! test
+External links: nofollow domain exception
+!! wikitext
+A [https://no-nofollow.org/foobar link], and another [https://example.org
link].
+!! html
+A https://no-nofollow.org/foobar;>link,
and another https://example.org;>link.
+
+!!end
+
+!! test
External image
!! wikitext
External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
@@ -20730,7 +20739,6 @@
!! html/php
Screen
this is not the the title
-Warning: Display title "whatever" was
ignored since it is not equivalent to the page's actual title.
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 3609ac3..693b45a 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 = "be5e77d810f96f8664631bb48f416e53a56f9cbf";
+var expectedSHA1 = "072f3924d1666914099d4a6bb88c2715f3184b7f";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "20bdcc7620c34f55f1aa1ec55c6e19eee7a6cd3c";
+var latestCommit = "35477b6e3aa156c99f9ed905e2b10a01de12267b";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/292601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f08aba0044e1ce16a4a092bf314fb9713f0ef2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie5588c421e1d127e8dea14507ca82e55bde91a68
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 189af6d..523953c 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -13955,7 +13955,7 @@
!! wikitext
[[Image:Barfoo.jpg]]
!! html/php
-File:Barfoo.jpg
+File:Barfoo.jpg
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 1f2f6dc..3609ac3 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 = "891a32d0fc11b718a4e2ba354a3cba9c7f68afe8";
+var expectedSHA1 = "be5e77d810f96f8664631bb48f416e53a56f9cbf";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "f8cc99ea9885103ed4ee23b83efc003d24c98450";
+var latestCommit = "20bdcc7620c34f55f1aa1ec55c6e19eee7a6cd3c";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/291157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5588c421e1d127e8dea14507ca82e55bde91a68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291157
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie5588c421e1d127e8dea14507ca82e55bde91a68
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/57/291157/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 189af6d..523953c 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -13955,7 +13955,7 @@
!! wikitext
[[Image:Barfoo.jpg]]
!! html/php
-File:Barfoo.jpg
+File:Barfoo.jpg
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 1f2f6dc..3609ac3 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 = "891a32d0fc11b718a4e2ba354a3cba9c7f68afe8";
+var expectedSHA1 = "be5e77d810f96f8664631bb48f416e53a56f9cbf";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "f8cc99ea9885103ed4ee23b83efc003d24c98450";
+var latestCommit = "20bdcc7620c34f55f1aa1ec55c6e19eee7a6cd3c";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/291157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5588c421e1d127e8dea14507ca82e55bde91a68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Iea7ef905f59c68bb0d03250fdbb118636cd2d14e
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 90e6265..f343ac1 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -13955,7 +13955,7 @@
!! wikitext
[[Image:Barfoo.jpg]]
!! html/php
-File:Barfoo.jpg
+File:Barfoo.jpg
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index bd924d2..1f2f6dc 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 = "94c66b4f3c5998b6d5280ec645b695a89bb6baef";
+var expectedSHA1 = "891a32d0fc11b718a4e2ba354a3cba9c7f68afe8";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "13ece3550e4935865a410009e060b4f4b036f949";
+var latestCommit = "f8cc99ea9885103ed4ee23b83efc003d24c98450";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/290502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea7ef905f59c68bb0d03250fdbb118636cd2d14e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290502
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Iea7ef905f59c68bb0d03250fdbb118636cd2d14e
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/02/290502/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 90e6265..f343ac1 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -13955,7 +13955,7 @@
!! wikitext
[[Image:Barfoo.jpg]]
!! html/php
-File:Barfoo.jpg
+File:Barfoo.jpg
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index bd924d2..1f2f6dc 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 = "94c66b4f3c5998b6d5280ec645b695a89bb6baef";
+var expectedSHA1 = "891a32d0fc11b718a4e2ba354a3cba9c7f68afe8";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "13ece3550e4935865a410009e060b4f4b036f949";
+var latestCommit = "f8cc99ea9885103ed4ee23b83efc003d24c98450";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/290502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea7ef905f59c68bb0d03250fdbb118636cd2d14e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Icd28eed4091483edae49cc3e4fcc3846a1e3473c
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 15 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 7051b4f..90e6265 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -2266,6 +2266,17 @@
!! end
!! test
+ inside of #tag:pre
+!! wikitext
+{{#tag:pre|Foo bar}}
+!! html/php
+Foo bar
+
+!! html/parsoid
+Foo →bar
+!! end
+
+!! test
and preference (first one wins)
!! wikitext
@@ -13150,7 +13161,7 @@
!! config
wgExternalLinkTarget='foobar'
!! html/php
-http://example.com/; target="foobar" rel="nofollow">http://example.com/images/3/3a/Foobar.jpg; width="1941"
height="220" />
+http://example.com/; target="foobar" rel="nofollow noreferrer
noopener">http://example.com/images/3/3a/Foobar.jpg;
width="1941" height="220" />
!! end
@@ -13184,7 +13195,7 @@
!! config
wgExternalLinkTarget='foobar'
!! html/php
-http://example.com/; title="Title" target="foobar"
rel="nofollow">http://example.com/images/3/3a/Foobar.jpg;
width="1941" height="220" />
+http://example.com/; title="Title" target="foobar" rel="nofollow
noreferrer noopener">http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 049f366..bd924d2 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 = "8e19c2371b24bd1ab2f468c43e9e371770d4c324";
+var expectedSHA1 = "94c66b4f3c5998b6d5280ec645b695a89bb6baef";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "7654867bbc071091e38aa783ee5ecec6ee431bb2";
+var latestCommit = "13ece3550e4935865a410009e060b4f4b036f949";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/290355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icd28eed4091483edae49cc3e4fcc3846a1e3473c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/290355
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Icd28eed4091483edae49cc3e4fcc3846a1e3473c
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/55/290355/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 7051b4f..90e6265 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -2266,6 +2266,17 @@
!! end
!! test
+ inside of #tag:pre
+!! wikitext
+{{#tag:pre|Foo bar}}
+!! html/php
+Foo bar
+
+!! html/parsoid
+Foo →bar
+!! end
+
+!! test
and preference (first one wins)
!! wikitext
@@ -13150,7 +13161,7 @@
!! config
wgExternalLinkTarget='foobar'
!! html/php
-http://example.com/; target="foobar" rel="nofollow">http://example.com/images/3/3a/Foobar.jpg; width="1941"
height="220" />
+http://example.com/; target="foobar" rel="nofollow noreferrer
noopener">http://example.com/images/3/3a/Foobar.jpg;
width="1941" height="220" />
!! end
@@ -13184,7 +13195,7 @@
!! config
wgExternalLinkTarget='foobar'
!! html/php
-http://example.com/; title="Title" target="foobar"
rel="nofollow">http://example.com/images/3/3a/Foobar.jpg;
width="1941" height="220" />
+http://example.com/; title="Title" target="foobar" rel="nofollow
noreferrer noopener">http://example.com/images/3/3a/Foobar.jpg; width="1941" height="220" />
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 049f366..bd924d2 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 = "8e19c2371b24bd1ab2f468c43e9e371770d4c324";
+var expectedSHA1 = "94c66b4f3c5998b6d5280ec645b695a89bb6baef";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "7654867bbc071091e38aa783ee5ecec6ee431bb2";
+var latestCommit = "13ece3550e4935865a410009e060b4f4b036f949";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/290355
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd28eed4091483edae49cc3e4fcc3846a1e3473c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* The blacklist change looks like a true failure
Change-Id: Ie9441a771442ab6c64c1f3e69c2ea50a247daf14
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 22 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 444c8cb..5a71b44 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1546,6 +1546,7 @@
add("selser", "Invalid attributes in table cell (bug 1830) [[0,[2,0]]]",
"{|\n|Cell:|broken\n|}");
add("selser", "Invalid attributes in table cell (bug 1830) [[3,[[2],0]]]",
"{|\n|otq3btd8klf2yb9\n|Cell:|broken\n|}");
add("selser", "Invalid attributes in table cell (bug 1830) [[0,[1,3]]]",
"{|\n|Cell:|broken\n|}");
+add("selser", "Element attributes with double ! should not be broken up by
[[3,[[[0,4,0]],0]]]", "{|\n! hi \ndx51fgzl5z478pvi\n ho\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[0,[0,2]]]", "{|\n| hi\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[2,2]]", "{|\n| hi\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[0,[2,3]]]", "{|\n| hi\n|}");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index da27205..7051b4f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -6334,6 +6334,24 @@
!! end
!! test
+Element attributes with double ! should not be broken up by
+!! wikitext
+{|
+! hi ha ho
+|}
+!! html/php
+
+
+ hi ha ho
+
+
+!! html/parsoid
+
+ hi ha
ho
+
+!! end
+
+!! test
! and || in element attributes should not be parsed as /
!! wikitext
{|
@@ -20628,6 +20646,7 @@
!! html/php
Screen
this is not the the title
+Warning: Display title "whatever" was
ignored since it is not equivalent to the page's actual title.
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 7c8424d..049f366 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 = "aa2c0529fda815b8bd66bae7c710c096f06142fb";
+var expectedSHA1 = "8e19c2371b24bd1ab2f468c43e9e371770d4c324";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "002e63c94b00104f1098f8bc490ad75c8ac8fc8c";
+var latestCommit = "7654867bbc071091e38aa783ee5ecec6ee431bb2";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/288703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9441a771442ab6c64c1f3e69c2ea50a247daf14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Cscott
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288703
Change subject: Sync parserTests with core
..
Sync parserTests with core
* The blacklist change looks like a true failure
Change-Id: Ie9441a771442ab6c64c1f3e69c2ea50a247daf14
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 22 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/03/288703/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 444c8cb..5a71b44 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -1546,6 +1546,7 @@
add("selser", "Invalid attributes in table cell (bug 1830) [[0,[2,0]]]",
"{|\n|Cell:|broken\n|}");
add("selser", "Invalid attributes in table cell (bug 1830) [[3,[[2],0]]]",
"{|\n|otq3btd8klf2yb9\n|Cell:|broken\n|}");
add("selser", "Invalid attributes in table cell (bug 1830) [[0,[1,3]]]",
"{|\n|Cell:|broken\n|}");
+add("selser", "Element attributes with double ! should not be broken up by
[[3,[[[0,4,0]],0]]]", "{|\n! hi \ndx51fgzl5z478pvi\n ho\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[0,[0,2]]]", "{|\n| hi\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[2,2]]", "{|\n| hi\n|}");
add("selser", "! and || in element attributes should not be parsed as
/ [[0,[2,3]]]", "{|\n| hi\n|}");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index da27205..7051b4f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -6334,6 +6334,24 @@
!! end
!! test
+Element attributes with double ! should not be broken up by
+!! wikitext
+{|
+! hi ha ho
+|}
+!! html/php
+
+
+ hi ha ho
+
+
+!! html/parsoid
+
+ hi ha
ho
+
+!! end
+
+!! test
! and || in element attributes should not be parsed as /
!! wikitext
{|
@@ -20628,6 +20646,7 @@
!! html/php
Screen
this is not the the title
+Warning: Display title "whatever" was
ignored since it is not equivalent to the page's actual title.
!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 7c8424d..049f366 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 = "aa2c0529fda815b8bd66bae7c710c096f06142fb";
+var expectedSHA1 = "8e19c2371b24bd1ab2f468c43e9e371770d4c324";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "002e63c94b00104f1098f8bc490ad75c8ac8fc8c";
+var latestCommit = "7654867bbc071091e38aa783ee5ecec6ee431bb2";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/288703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9441a771442ab6c64c1f3e69c2ea50a247daf14
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: Sync parserTests with core .. Sync parserTests with core Change-Id: I6d7de62d0605dc90e15688ba51612b302446ef52 --- M tests/parserTests.txt M tools/fetch-parserTests.txt.js 2 files changed, 13 insertions(+), 16 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index d3d566b..691113d 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -18,7 +18,6 @@ # ill add inter-language links # (ignored by Parsoid, since it emits s) # subpage enable subpages (disabled by default) -# noxml don't check for XML well-formedness # title=[[XXX]] run test using article title XXX # language=XXX set content language to XXX for this test # variant=XXX set the variant of language for this test (eg zh-tw) @@ -2520,7 +2519,6 @@ !! end -## PHP parser discards the " !! html/php x - +pre +!! html/php+tidy + +x + +pre !! html/parsoid x @@ -12167,7 +12170,7 @@ !! test pre-save transform: unclosed tag !! options -pst noxml +pst !! wikitext '''not wiki''' !! html/php @@ -12177,7 +12180,7 @@ !! test pre-save transform: mixed tag case !! options -pst noxml +pst !! wikitext '''not wiki''' !! html/php @@ -12187,7 +12190,7 @@ !! test pre-save transform: unclosed comment in !! options -pst noxml +pst !! wikitext
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/281821 Change subject: Sync parserTests with core .. Sync parserTests with core Change-Id: I6d7de62d0605dc90e15688ba51612b302446ef52 --- M tests/parserTests.txt M tools/fetch-parserTests.txt.js 2 files changed, 13 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/21/281821/1 diff --git a/tests/parserTests.txt b/tests/parserTests.txt index d3d566b..691113d 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -18,7 +18,6 @@ # ill add inter-language links # (ignored by Parsoid, since it emits s) # subpage enable subpages (disabled by default) -# noxml don't check for XML well-formedness # title=[[XXX]] run test using article title XXX # language=XXX set content language to XXX for this test # variant=XXX set the variant of language for this test (eg zh-tw) @@ -2520,7 +2519,6 @@ !! end -## PHP parser discards the " !! html/php x - +pre +!! html/php+tidy + +x + +pre !! html/parsoid x @@ -12167,7 +12170,7 @@ !! test pre-save transform: unclosed tag !! options -pst noxml +pst !! wikitext '''not wiki''' !! html/php @@ -12177,7 +12180,7 @@ !! test pre-save transform: mixed tag case !! options -pst noxml +pst !! wikitext '''not wiki''' !! html/php @@ -12187,7 +12190,7 @@ !! test pre-save transform: unclosed comment in !! options -pst noxml +pst !! wikitext
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ife9c43c9f04a4703eb8c4e9f7e357a4859ebb3b3
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index c5adbf0..cacbcd4 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4773,7 +4773,7 @@
!! wikitext
External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
!! html
-External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png" />
+External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"/>
!! end
@@ -4782,7 +4782,7 @@
!! wikitext
External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
!! html
-External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
/>
+External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"/>
!! end
@@ -4856,7 +4856,7 @@
!! wikitext
ja-style clickable images: [http://example.com
http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png]
!! html/php
-ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
/>
+ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png;
alt="Ncwikicol.png"/>
!! html/parsoid
ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
data-parsoid='{"type":"extlink"}'/>
@@ -20881,7 +20881,7 @@
!! wikitext
http://www.example.org/pic.png <-- U+3000 (vim: ^Vu3000)
!! html
-http://www.example.org/pic.png; alt="pic.png" /> -- U+3000
(vim: ^Vu3000)
+http://www.example.org/pic.png; alt="pic.png"/> -- U+3000
(vim: ^Vu3000)
!! end
@@ -24683,7 +24683,7 @@
!! wikitext
http://purl.org/dc/terms/;
property="dct:title">MediaWiki
!! html/php
-MediaWiki
+MediaWiki
!! html/parsoid
http://purl.org/dc/terms/; data-x-property="dct:title"
data-parsoid='{"stx":"html"}'>MediaWiki
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 56a21b4..f55db56 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 = "757fbe6bc60e17ab530238c0ceccc9fe1b434227";
+var expectedSHA1 = "e7a272e0d6ce2a7112c953666bbdf70987a3f874";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "88d7413ddff9bdcdfd65e3f2b05e0ec457ee891a";
+var latestCommit = "5a0da02e6a42da80035d7b3591e257c0c995e5e3";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/279412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9c43c9f04a4703eb8c4e9f7e357a4859ebb3b3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/279412
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ife9c43c9f04a4703eb8c4e9f7e357a4859ebb3b3
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/12/279412/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index c5adbf0..cacbcd4 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4773,7 +4773,7 @@
!! wikitext
External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
!! html
-External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png" />
+External image: http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"/>
!! end
@@ -4782,7 +4782,7 @@
!! wikitext
External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png
!! html
-External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
/>
+External image from https: https://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"/>
!! end
@@ -4856,7 +4856,7 @@
!! wikitext
ja-style clickable images: [http://example.com
http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png]
!! html/php
-ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
/>
+ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png;
alt="Ncwikicol.png"/>
!! html/parsoid
ja-style clickable images: http://example.com;>http://meta.wikimedia.org/upload/f/f1/Ncwikicol.png; alt="Ncwikicol.png"
data-parsoid='{"type":"extlink"}'/>
@@ -20881,7 +20881,7 @@
!! wikitext
http://www.example.org/pic.png <-- U+3000 (vim: ^Vu3000)
!! html
-http://www.example.org/pic.png; alt="pic.png" /> -- U+3000
(vim: ^Vu3000)
+http://www.example.org/pic.png; alt="pic.png"/> -- U+3000
(vim: ^Vu3000)
!! end
@@ -24683,7 +24683,7 @@
!! wikitext
http://purl.org/dc/terms/;
property="dct:title">MediaWiki
!! html/php
-MediaWiki
+MediaWiki
!! html/parsoid
http://purl.org/dc/terms/; data-x-property="dct:title"
data-parsoid='{"stx":"html"}'>MediaWiki
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 56a21b4..f55db56 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 = "757fbe6bc60e17ab530238c0ceccc9fe1b434227";
+var expectedSHA1 = "e7a272e0d6ce2a7112c953666bbdf70987a3f874";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "88d7413ddff9bdcdfd65e3f2b05e0ec457ee891a";
+var latestCommit = "5a0da02e6a42da80035d7b3591e257c0c995e5e3";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/279412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife9c43c9f04a4703eb8c4e9f7e357a4859ebb3b3
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* The new failing test is from a regression introduced in cf9fb74f.
That patch pays lip service to the core patch and then goes ahead and
breaks it.
Change-Id: Ic23f7f144f22e361d3edf2cded28fed4cd17320b
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 70 insertions(+), 100 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index b7372a8..28abfe0 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -56,6 +56,7 @@
add("wt2html", "Definition Lists: colons and tables 1", "\n
x\n\n\n
y\n");
add("wt2html", "Bug 2702: Mismatched , and tags are invalid", "http://example.com\;
data-parsoid='{\"targetOff\":22,\"contentOffsets\":[22,28],\"dsr\":[2,29,20,1]}'>text\nhttp://example.com\;
data-parsoid='{\"targetOff\":50,\"contentOffsets\":[50,57],\"dsr\":[30,58,20,1]}'>text\nSomething http://example.com\;
data-parsoid='{\"targetOff\":94,\"contentOffsets\":[94,105],\"dsr\":[74,106,20,1]}'>in
italic\nSomething http://example.com\;
data-parsoid='{\"targetOff\":139,\"contentOffsets\":[139,160],\"dsr\":[119,161,20,1]}'>mixed, even
bold'\nNow http://example.com\;
data-parsoid='{\"targetOff\":194,\"contentOffsets\":[194,203],\"dsr\":[174,204,20,1]}'>both");
add("wt2html", "External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check)", "Some http://example.com/\;
data-parsoid='{\"targetOff\":28,\"contentOffsets\":[28,56],\"dsr\":[7,57,21,1]}'>pretty
italics and stuff!");
+add("wt2html", "! and || in element attributes should not be parsed as
/", "\n div
style=\"color: red !important;\" data-contrived=\"put this here \">hi\n");
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/Chinese
\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/
Chinese \"},\"sa\":{\"href\":\" zh :Chinese
\"},\"dsr\":[15,43,null,null]}'/>");
@@ -92,6 +93,7 @@
add("wt2html", "Magic Word: {{PAGENAMEE}}", "");
add("wt2html", "Magic Word: {{PAGENAMEE}} with metacharacters (bug 26781)",
"");
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", "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", "Namespace 1 {{ns:1}}", "1");
@@ -155,7 +157,6 @@
add("wt2html", "Media link with nasty text", "Safe
Link\"
onmouseover=\"alert(document.cookie)\" onfoo=\"");
add("wt2html", "Media link to nonexistent file (bug 1702)", "Media:No such.jpg");
add("wt2html", "(bug 19451) Links should refer to the normalized form.", "אַ\nאַ\nאַ\nאַ\nאַ");
-add("wt2html", "Attribute test: equals, then nothing", "foo");
add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309)", "alert(document.cookie)\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"stx\":\"html\",\"a\":{\"style\":\"float: right;
>alert(document.cookie)\"},\"sa\":{\"style\":\"float: right;
{{{1}}}\"},\"dsr\":[0,55,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"div
style\",\"href\":\"./Template:Div_style\"},\"params\":{\"1\":{\"wt\":\"\\\">script>alert(document.cookie)/script>\"}},\"i\":0}}]}'>Magic
div");
add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309)", "alert(document.cookie)\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"stx\":\"html\",\"a\":{\"style\":\"float: right;
>alert(document.cookie)\"},\"sa\":{\"style\":\"float: right;
{{{1}}}\"},\"dsr\":[0,56,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"div
style\",\"href\":\"./Template:Div_style\"},\"params\":{\"1\":{\"wt\":\"\\\"
>script>alert(document.cookie)/script>\"}},\"i\":0}}]}'>Magic
div");
add("wt2html", "CSS safety test (all browsers): vertical tab (bug 55332 /
CVE-2013-4567)", "A");
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/272834
Change subject: Sync parserTests with core
..
Sync parserTests with core
* The new failing test is from a regression introduced in cf9fb74f.
That patch pays lip service to the core patch and then goes ahead and
breaks it.
Change-Id: Ic23f7f144f22e361d3edf2cded28fed4cd17320b
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 70 insertions(+), 100 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/34/272834/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index b7372a8..28abfe0 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -56,6 +56,7 @@
add("wt2html", "Definition Lists: colons and tables 1", "\n
x\n\n\n
y\n");
add("wt2html", "Bug 2702: Mismatched , and tags are invalid", "http://example.com\;
data-parsoid='{\"targetOff\":22,\"contentOffsets\":[22,28],\"dsr\":[2,29,20,1]}'>text\nhttp://example.com\;
data-parsoid='{\"targetOff\":50,\"contentOffsets\":[50,57],\"dsr\":[30,58,20,1]}'>text\nSomething http://example.com\;
data-parsoid='{\"targetOff\":94,\"contentOffsets\":[94,105],\"dsr\":[74,106,20,1]}'>in
italic\nSomething http://example.com\;
data-parsoid='{\"targetOff\":139,\"contentOffsets\":[139,160],\"dsr\":[119,161,20,1]}'>mixed, even
bold'\nNow http://example.com\;
data-parsoid='{\"targetOff\":194,\"contentOffsets\":[194,203],\"dsr\":[174,204,20,1]}'>both");
add("wt2html", "External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check)", "Some http://example.com/\;
data-parsoid='{\"targetOff\":28,\"contentOffsets\":[28,56],\"dsr\":[7,57,21,1]}'>pretty
italics and stuff!");
+add("wt2html", "! and || in element attributes should not be parsed as
/", "\n div
style=\"color: red !important;\" data-contrived=\"put this here \">hi\n");
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/Chinese
\"
data-parsoid='{\"stx\":\"simple\",\"a\":{\"href\":\"http://zh.wikipedia.org/wiki/
Chinese \"},\"sa\":{\"href\":\" zh :Chinese
\"},\"dsr\":[15,43,null,null]}'/>");
@@ -92,6 +93,7 @@
add("wt2html", "Magic Word: {{PAGENAMEE}}", "");
add("wt2html", "Magic Word: {{PAGENAMEE}} with metacharacters (bug 26781)",
"");
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", "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", "Namespace 1 {{ns:1}}", "1");
@@ -155,7 +157,6 @@
add("wt2html", "Media link with nasty text", "Safe
Link\"
onmouseover=\"alert(document.cookie)\" onfoo=\"");
add("wt2html", "Media link to nonexistent file (bug 1702)", "Media:No such.jpg");
add("wt2html", "(bug 19451) Links should refer to the normalized form.", "אַ\nאַ\nאַ\nאַ\nאַ");
-add("wt2html", "Attribute test: equals, then nothing", "foo");
add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309)", "alert(document.cookie)\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"stx\":\"html\",\"a\":{\"style\":\"float: right;
>alert(document.cookie)\"},\"sa\":{\"style\":\"float: right;
{{{1}}}\"},\"dsr\":[0,55,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"div
style\",\"href\":\"./Template:Div_style\"},\"params\":{\"1\":{\"wt\":\"\\\">script>alert(document.cookie)/script>\"}},\"i\":0}}]}'>Magic
div");
add("wt2html", "Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309)", "alert(document.cookie)\" about=\"#mwt1\"
typeof=\"mw:Transclusion\"
data-parsoid='{\"stx\":\"html\",\"a\":{\"style\":\"float: right;
>alert(document.cookie)\"},\"sa\":{\"style\":\"float: right;
{{{1}}}\"},\"dsr\":[0,56,null,null],\"pi\":[[{\"k\":\"1\"}]]}'
data-mw='{\"parts\":[{\"template\":{\"target\":{\"wt\":\"div
style\",\"href\":\"./Template:Div_style\"},\"params\":{\"1\":{\"wt\":\"\\\"
>script>alert(document.cookie)/script>\"}},\"i\":0}}]}'>Magic
div");
add("wt2html", "CSS safety test (all browsers): vertical
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Gallery changes are from,
I3b73189b27cc35fade4809477cf18779b953aa3b
* Unclosed ext test changes are from,
Ia2f24dbfb3567c4b0778761585e6c0303d11ddd0
though an html/parsoid section was added for passing tests.
* Number of files changes is from,
I6a3b307ad9c82e9df0aeec025934d736eec8375f
Change-Id: I8dffbb56e9e0e3bcce064df27a6f12b4391f33a0
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 22 insertions(+), 17 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 3bcbbc0..a06a183 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -560,8 +560,8 @@
add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
MediaWiki:Mainpagexxx]\n");
add("html2html", "Special:Search page linking.", "Special:Search\n");
add("html2html", "Say the magic word", "
Parser test\n
Parser_test\n Parser
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n
[/index.php?title=Template:Dynamicaction=editredlink=1
Template:Dynamic]\n");
-add("html2html", "Gallery", "\t\t*
\t\t\tImage1.png
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage2.gif
\t\t\t \t\t\t
\t\t\n\t\t* \t\t\tImage3
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage4
\t\t\t 300px| centre
\t\t\t \t\t\n\t\t*
\t\t\tImage5.svg
\t\t\t http:/\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[697,711,0,0]}'>http:/
\t\t\t \t\t\n\t\t*
\t\t\t* image6
\t\t\t\t\t\t
\t\t\n");
-add("html2html", "Gallery (with options)", "\t* Foo Main Page\n\t\t* \t\t\tNonexistent.jpg
\t\t\t caption \t\t\t
\t\t\n\t\t* \t\t\tNonexistent.jpg
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[440,503,null,null]}'/> \t\t\t
some caption Main Page \t\t\t \t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[719,782,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[948,1011,null,null]}'/> \t\t\t Blabla|blabla.
\t\t\t \t\t\n");
+add("html2html", "Gallery", "\t\t*
\t\t\tImage1.png
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage2.gif
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage3
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage4
\t\t\t centre \t\t\t
\t\t\n\t\t* \t\t\tImage5.svg
\t\t\t http:/\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[684,698,0,0]}'>http:/
\t\t\t \t\t\n\t\t*
\t\t\t* image6
\t\t\t\t\t\t
\t\t\n");
+add("html2html", "Gallery (with options)", "\t* Foo Main Page\n\t\t* \t\t\tNonexistent.jpg
\t\t\t caption \t\t\t
\t\t\n\t\t* \t\t\tNonexistent.jpg
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[440,503,null,null]}'/> \t\t\t
some caption Main Page \t\t\t \t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[719,782,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[948,1011,null,null]}'/> \t\t\t blabla.
\t\t\t \t\t\n");
add("html2html", "Gallery with link that has fragment", "\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[336,400,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[566,630,null,null]}'/> \t\t\t
caption \t\t\t \t\t\n");
add("html2html", "Gallery with wikitext inside caption", "\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t
http://example.com/images/thumb/3/3a/Foobar.jpg/20px-Foobar.jpg\;
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266320
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Gallery changes are from,
I3b73189b27cc35fade4809477cf18779b953aa3b
* Unclosed ext test changes are from,
Ia2f24dbfb3567c4b0778761585e6c0303d11ddd0
though an html/parsoid section was added for passing tests.
* Number of files changes is from,
I6a3b307ad9c82e9df0aeec025934d736eec8375f
Change-Id: I8dffbb56e9e0e3bcce064df27a6f12b4391f33a0
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
3 files changed, 22 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/20/266320/1
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 3bcbbc0..a06a183 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -560,8 +560,8 @@
add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
MediaWiki:Mainpagexxx]\n");
add("html2html", "Special:Search page linking.", "Special:Search\n");
add("html2html", "Say the magic word", "
Parser test\n
Parser_test\n Parser
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n
[/index.php?title=Template:Dynamicaction=editredlink=1
Template:Dynamic]\n");
-add("html2html", "Gallery", "\t\t*
\t\t\tImage1.png
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage2.gif
\t\t\t \t\t\t
\t\t\n\t\t* \t\t\tImage3
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage4
\t\t\t 300px| centre
\t\t\t \t\t\n\t\t*
\t\t\tImage5.svg
\t\t\t http:/\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[697,711,0,0]}'>http:/
\t\t\t \t\t\n\t\t*
\t\t\t* image6
\t\t\t\t\t\t
\t\t\n");
-add("html2html", "Gallery (with options)", "\t* Foo Main Page\n\t\t* \t\t\tNonexistent.jpg
\t\t\t caption \t\t\t
\t\t\n\t\t* \t\t\tNonexistent.jpg
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[440,503,null,null]}'/> \t\t\t
some caption Main Page \t\t\t \t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[719,782,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[948,1011,null,null]}'/> \t\t\t Blabla|blabla.
\t\t\t \t\t\n");
+add("html2html", "Gallery", "\t\t*
\t\t\tImage1.png
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage2.gif
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage3
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\tImage4
\t\t\t centre \t\t\t
\t\t\n\t\t* \t\t\tImage5.svg
\t\t\t http:/\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[684,698,0,0]}'>http:/
\t\t\t \t\t\n\t\t*
\t\t\t* image6
\t\t\t\t\t\t
\t\t\n");
+add("html2html", "Gallery (with options)", "\t* Foo Main Page\n\t\t* \t\t\tNonexistent.jpg
\t\t\t caption \t\t\t
\t\t\n\t\t* \t\t\tNonexistent.jpg
\t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[440,503,null,null]}'/> \t\t\t
some caption Main Page \t\t\t \t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[719,782,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg\;
alt=\"70px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[948,1011,null,null]}'/> \t\t\t blabla.
\t\t\t \t\t\n");
add("html2html", "Gallery with link that has fragment", "\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[336,400,null,null]}'/> \t\t\t\t\t\t
\t\t\n\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[566,630,null,null]}'/> \t\t\t
caption \t\t\t \t\t\n");
add("html2html", "Gallery with wikitext inside caption", "\t\t* \t\t\thttp://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg\;
alt=\"120px-Foobar.jpg\" rel=\"mw:externalImage\"
data-parsoid='{\"dsr\":[106,170,null,null]}'/> \t\t\t
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261602
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Marked the synced test html/php since that test will crash Parsoid
Change-Id: I6f52c98ade648c462906eef51bc16ad4b8a6e0e2
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/02/261602/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 7437a8c..bac4de5 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -20682,6 +20682,15 @@
!! end
!! test
+Strip reserved data attributes
+!! wikitext
+d
+!! html/php
+d
+
+!! end
+
+!! test
percent-encoding and + signs in internal links (Bug 26410)
!! wikitext
[[User:+%]] [[Page+title%]]
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 3fc4a08..eead584 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 = "9d6572659537683fac509869482553e8eef8aee9";
+var expectedSHA1 = "9669eb7effc592dc69f2a67a57de05ad46471fb7";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
+var latestCommit = "edf52ea0767467f205e91aeae1664f718f9b0860";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/261602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f52c98ade648c462906eef51bc16ad4b8a6e0e2
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Marked the synced test html/php since that test will crash Parsoid
Change-Id: I6f52c98ade648c462906eef51bc16ad4b8a6e0e2
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 7437a8c..bac4de5 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -20682,6 +20682,15 @@
!! end
!! test
+Strip reserved data attributes
+!! wikitext
+d
+!! html/php
+d
+
+!! end
+
+!! test
percent-encoding and + signs in internal links (Bug 26410)
!! wikitext
[[User:+%]] [[Page+title%]]
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index 3fc4a08..eead584 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 = "9d6572659537683fac509869482553e8eef8aee9";
+var expectedSHA1 = "9669eb7effc592dc69f2a67a57de05ad46471fb7";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
+var latestCommit = "edf52ea0767467f205e91aeae1664f718f9b0860";
var fs = require('fs');
var path = require('path');
--
To view, visit https://gerrit.wikimedia.org/r/261602
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f52c98ade648c462906eef51bc16ad4b8a6e0e2
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
M tools/sync-parserTests.js
4 files changed, 31 insertions(+), 15 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 30c9a80..afe39e9 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -579,8 +579,8 @@
add("html2html", "Fuzz testing: Parser14", " onmouseover= \nhttp://\n\n\n Contents \n\n\n 1 onmouseover=\n\n\n");
add("html2html", "Fuzz testing: Parser24", "\n{{{|\n >\n\n\nMOVE
YOUR MOUSE CURSOR OVER THIS TEXT\n\n\n\n\n\n");
add("html2html", "Fuzz testing: encoded newline in generated HTML replacements
(bug 6577)", " \n");
-add("html2html", "Special page transclusion", "\n
Xyzzyx
\n\n");
-add("html2html", "Special page transclusion twice (bug 5021)", "\n
Xyzzyx
\n\n\n Xyzzyx
\n\n");
+add("html2html", "Special page transclusion", " Xyzzyx\n");
+add("html2html", "Special page transclusion twice (bug 5021)", " Xyzzyx\n\n
Xyzzyx\n");
add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
MediaWiki:Mainpagexxx]\n");
add("html2html", "Special:Search page linking.", "Special:Search\n");
add("html2html", "Say the magic word", "
Parser test\n
Parser_test\n Parser
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n
[/index.php?title=Template:Dynamicaction=editredlink=1
Template:Dynamic]\n");
@@ -1190,8 +1190,8 @@
add("html2wt", "Inline wiki vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Inline HTML vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Mixing markup for italics and bold",
"'''bold''bold''bolditalics'\n");
-add("html2wt", "Special page transclusion", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
-add("html2wt", "Special page transclusion twice (bug 5021)", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
+add("html2wt", "Special page transclusion", "* [[wiki/Xyzzyx|Xyzzyx]]\n");
+add("html2wt", "Special page transclusion twice (bug 5021)", "*
[[wiki/Xyzzyx|Xyzzyx]]\n\n* [[wiki/Xyzzyx|Xyzzyx]]\n");
add("html2wt", "Transclusion of default MediaWiki message", "Main Page\n");
add("html2wt", "Transclusion of nonexistent MediaWiki message",
"[/index.php?title=MediaWiki:Mainpagexxx=edit=1
MediaWiki:Mainpagexxx]\n");
add("html2wt", "Transclusion of MediaWiki message with underscore",
"History\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 192815d..58860e9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -17120,8 +17120,8 @@
!! wikitext
{{Special:Prefixindex/Xyzzyx}}
!! html
- Xyzzyx
-
+Xyzzyx
+
!! end
@@ -17132,10 +17132,10 @@
{{Special:Prefixindex/Xyzzyx}}
{{Special:Prefixindex/Xyzzyx}}
!! html
- Xyzzyx
-
- Xyzzyx
-
+Xyzzyx
+
+Xyzzyx
+
!! end
@@ -26323,3 +26323,19 @@
foobar
!! end
+
+!! test
+Empty LI (T49673)
+!! wikitext
+* a
+*
+*
+* b
+!! html/php+tidy
+
+a
+
+
+b
+
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index f22588e..c1e102f 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 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
+var expectedSHA1 = "9d6572659537683fac509869482553e8eef8aee9";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
+var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
var fs = require('fs');
var path = require('path');
diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js
index e4acf15..498e068 100755
--- a/tools/sync-parserTests.js
+++ b/tools/sync-parserTests.js
@@ -12,7 +12,7 @@
$BRANCH is a branch name for the patch to mediawiki/core (ie, 'pt-sync')
$ cd $PARSOID
- $ tests/sync-parserTests.js $MEDIAWIKI $BRANCH
+ $ tools/sync-parserTests.js $MEDIAWIKI $BRANCH
$ cd $MEDIAWIKI
$ git rebase master
... resolve conflicts, sigh ...
@@ -23,8 +23,8 @@
... time passes, eventually your patch is merged to core ...
$ cd $PARSOID
- $ tests/fetch-parserTests.txt.js --force
- $ tests/parserTests.js --rewrite-blacklist
+ $ tools/fetch-parserTests.txt.js --force
+ $ bin/parserTests.js
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252145
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
---
M tests/parserTests.txt
M tools/fetch-parserTests.txt.js
M tools/sync-parserTests.js
3 files changed, 27 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/45/252145/1
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 192815d..58860e9 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -17120,8 +17120,8 @@
!! wikitext
{{Special:Prefixindex/Xyzzyx}}
!! html
- Xyzzyx
-
+Xyzzyx
+
!! end
@@ -17132,10 +17132,10 @@
{{Special:Prefixindex/Xyzzyx}}
{{Special:Prefixindex/Xyzzyx}}
!! html
- Xyzzyx
-
- Xyzzyx
-
+Xyzzyx
+
+Xyzzyx
+
!! end
@@ -26323,3 +26323,19 @@
foobar
!! end
+
+!! test
+Empty LI (T49673)
+!! wikitext
+* a
+*
+*
+* b
+!! html/php+tidy
+
+a
+
+
+b
+
+!! end
diff --git a/tools/fetch-parserTests.txt.js b/tools/fetch-parserTests.txt.js
index f22588e..c1e102f 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 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
+var expectedSHA1 = "9d6572659537683fac509869482553e8eef8aee9";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
+var latestCommit = "1f08236b978afdc59aae75a8cc67ee1b20ae1489";
var fs = require('fs');
var path = require('path');
diff --git a/tools/sync-parserTests.js b/tools/sync-parserTests.js
index e4acf15..498e068 100755
--- a/tools/sync-parserTests.js
+++ b/tools/sync-parserTests.js
@@ -12,7 +12,7 @@
$BRANCH is a branch name for the patch to mediawiki/core (ie, 'pt-sync')
$ cd $PARSOID
- $ tests/sync-parserTests.js $MEDIAWIKI $BRANCH
+ $ tools/sync-parserTests.js $MEDIAWIKI $BRANCH
$ cd $MEDIAWIKI
$ git rebase master
... resolve conflicts, sigh ...
@@ -23,8 +23,8 @@
... time passes, eventually your patch is merged to core ...
$ cd $PARSOID
- $ tests/fetch-parserTests.txt.js --force
- $ tests/parserTests.js --rewrite-blacklist
+ $ tools/fetch-parserTests.txt.js --force
+ $ bin/parserTests.js --rewrite-blacklist
$ git add -u
$ git commit -m "Sync parserTests with core"
$ git review
--
To view, visit https://gerrit.wikimedia.org/r/252145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27b7fd70c8cf06b9ed39c005ba5bdea52fab1440
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247844
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/44/247844/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 54037bf..0d00d7f 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 = "077d8b70deb6d293ab7658db502cc54e220eb1fd";
+var expectedSHA1 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cc062f0e76a207310aba1b1ca514fbcb98b2f807";
+var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index dbfd93d..f888dca 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -575,8 +575,8 @@
add("html2html", "Fuzz testing: Parser14", " onmouseover= \nhttp://\n\n\n Contents \n\n\n 1 onmouseover=\n\n\n");
add("html2html", "Fuzz testing: Parser24", "\n{{{|\n >\n\n\nMOVE
YOUR MOUSE CURSOR OVER THIS TEXT\n\n\n\n\n\n");
add("html2html", "Fuzz testing: encoded newline in generated HTML replacements
(bug 6577)", " \n");
-add("html2html", "Special page transclusion", "\nXyzzyx\n\n");
-add("html2html", "Special page transclusion twice (bug 5021)", "\nXyzzyx\n\n\nXyzzyx\n\n");
+add("html2html", "Special page transclusion", "\n
Xyzzyx
\n\n");
+add("html2html", "Special page transclusion twice (bug 5021)", "\n
Xyzzyx
\n\n\n Xyzzyx
\n\n");
add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
MediaWiki:Mainpagexxx]\n");
add("html2html", "Special:Search page linking.", "Special:Search\n");
add("html2html", "Say the magic word", "
Parser test\n
Parser_test\n Parser
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n
[/index.php?title=Template:Dynamicaction=editredlink=1
Template:Dynamic]\n");
@@ -1182,8 +1182,8 @@
add("html2wt", "Inline wiki vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Inline HTML vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Mixing markup for italics and bold",
"'''bold''bold''bolditalics'\n");
-add("html2wt", "Special page transclusion", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
-add("html2wt", "Special page transclusion twice (bug 5021)", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
+add("html2wt", "Special page transclusion", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
+add("html2wt", "Special page transclusion twice (bug 5021)", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
add("html2wt", "Transclusion of default MediaWiki message", "Main Page\n");
add("html2wt", "Transclusion of nonexistent MediaWiki message",
"[/index.php?title=MediaWiki:Mainpagexxx=edit=1
MediaWiki:Mainpagexxx]\n");
add("html2wt", "Transclusion of MediaWiki message with underscore",
"History\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 5789cc7..700032f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -16,7 +16,7 @@
# cat add category links
# (ignored by Parsoid, since it emits s)
# ill add inter-language links
-# (ignored by Parsoid, since it emits s)
+# (ignored by Parsoid, since it emits s)
# subpage enable subpages (disabled by default)
# noxml don't check for XML well-formedness
# title=[[XXX]] run test using article title XXX
@@ -17173,7 +17173,8 @@
!! wikitext
{{Special:Prefixindex/Xyzzyx}}
!! html
-Xyzzyx
+ Xyzzyx
+
!! end
@@ -17184,8 +17185,10 @@
{{Special:Prefixindex/Xyzzyx}}
{{Special:Prefixindex/Xyzzyx}}
!! html
-Xyzzyx
-Xyzzyx
+ Xyzzyx
+
+ Xyzzyx
+
!! end
--
To view, visit https://gerrit.wikimedia.org/r/247844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner:
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 13 insertions(+), 10 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 54037bf..0d00d7f 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 = "077d8b70deb6d293ab7658db502cc54e220eb1fd";
+var expectedSHA1 = "55ee32c143b30469bb46d9ac876eae18a66a04d3";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cc062f0e76a207310aba1b1ca514fbcb98b2f807";
+var latestCommit = "e97dca8cbdd49d5118fcb4a861b9bb043c480e89";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index dbfd93d..f888dca 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -575,8 +575,8 @@
add("html2html", "Fuzz testing: Parser14", " onmouseover= \nhttp://\n\n\n Contents \n\n\n 1 onmouseover=\n\n\n");
add("html2html", "Fuzz testing: Parser24", "\n{{{|\n >\n\n\nMOVE
YOUR MOUSE CURSOR OVER THIS TEXT\n\n\n\n\n\n");
add("html2html", "Fuzz testing: encoded newline in generated HTML replacements
(bug 6577)", " \n");
-add("html2html", "Special page transclusion", "\nXyzzyx\n\n");
-add("html2html", "Special page transclusion twice (bug 5021)", "\nXyzzyx\n\n\nXyzzyx\n\n");
+add("html2html", "Special page transclusion", "\n
Xyzzyx
\n\n");
+add("html2html", "Special page transclusion twice (bug 5021)", "\n
Xyzzyx
\n\n\n Xyzzyx
\n\n");
add("html2html", "Transclusion of nonexistent MediaWiki message", "[/index.php?title=MediaWiki:Mainpagexxxaction=editredlink=1
MediaWiki:Mainpagexxx]\n");
add("html2html", "Special:Search page linking.", "Special:Search\n");
add("html2html", "Say the magic word", "
Parser test\n
Parser_test\n Parser
test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Parser test\n Parser_test\n Talk:Parser test\n Talk:Parser_test\n Parser test\n Parser_test\n \n \n 0\n Talk\n Talk\n \n \n
[/index.php?title=Template:Dynamicaction=editredlink=1
Template:Dynamic]\n");
@@ -1182,8 +1182,8 @@
add("html2wt", "Inline wiki vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Inline HTML vs wiki block nesting", "'''Bold
paragraph'''\n\nNew wiki paragraph\n");
add("html2wt", "Mixing markup for italics and bold",
"'''bold''bold''bolditalics'\n");
-add("html2wt", "Special page transclusion", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
-add("html2wt", "Special page transclusion twice (bug 5021)", "{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n{|
class=\"mw-prefixindex-list-table\"\n|[[wiki/Xyzzyx|Xyzzyx]]\n|}\n");
+add("html2wt", "Special page transclusion", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
+add("html2wt", "Special page transclusion twice (bug 5021)", "\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n\n* [[wiki/Xyzzyx|Xyzzyx]] \n\n");
add("html2wt", "Transclusion of default MediaWiki message", "Main Page\n");
add("html2wt", "Transclusion of nonexistent MediaWiki message",
"[/index.php?title=MediaWiki:Mainpagexxx=edit=1
MediaWiki:Mainpagexxx]\n");
add("html2wt", "Transclusion of MediaWiki message with underscore",
"History\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 5789cc7..700032f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -16,7 +16,7 @@
# cat add category links
# (ignored by Parsoid, since it emits s)
# ill add inter-language links
-# (ignored by Parsoid, since it emits s)
+# (ignored by Parsoid, since it emits s)
# subpage enable subpages (disabled by default)
# noxml don't check for XML well-formedness
# title=[[XXX]] run test using article title XXX
@@ -17173,7 +17173,8 @@
!! wikitext
{{Special:Prefixindex/Xyzzyx}}
!! html
-Xyzzyx
+ Xyzzyx
+
!! end
@@ -17184,8 +17185,10 @@
{{Special:Prefixindex/Xyzzyx}}
{{Special:Prefixindex/Xyzzyx}}
!! html
-Xyzzyx
-Xyzzyx
+ Xyzzyx
+
+ Xyzzyx
+
!! end
--
To view, visit https://gerrit.wikimedia.org/r/247844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9336c1105cf56bef6f5497b62056c28d90c03eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/240720
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I57d7dcac01db328cd733d2f05ee85bd0f8f88fe6
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 17 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/20/240720/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index b16a4d1..54037bf 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 = "30066c1de8d9bc870de59908175f9dc3d828f404";
+var expectedSHA1 = "077d8b70deb6d293ab7658db502cc54e220eb1fd";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "bef1ba5c712233cee98c564c58382a8aefdcb838";
+var latestCommit = "cc062f0e76a207310aba1b1ca514fbcb98b2f807";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5e870a4..21330c0 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -784,7 +784,7 @@
add("html2wt", "Definition Lists: colons occurring in tags", "; a:b\n;
'''a:b'''\n; a:b\n; a:b\n; a:b\n; a\n: b\n;
{{echo|a:b}}\n; {{echo|''a:b''}}\n;;; ''a:b''\n");
add("html2wt", "Definition Lists: colons and tables 1", ": {|\n\n| x\n|}\n\n:
{|\n\n| y\n|}\n");
add("html2wt", "Definition Lists: colons and tables 2", ": {|\n\n| x\n|}\n:
{|\n\n| y\n|}\n");
-add("html2wt", "External links: Free with trailing punctuation",
"http://example.com,\nhttp://example.com;\nhttp://example.com\\\nhttp://example.com.\nhttp://example.com:\nhttp://example.com!\nhttp://example.com?\nhttp://example.com)\nhttp://example.com/url_with_(brackets)\n(http://example.com/url_without_brackets)\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\n;);
+add("html2wt", "External links: Free with trailing punctuation",
"http://example.com,\nhttp://example.com;\nhttp://example.com\\\nhttp://example.com.\nhttp://example.com:\nhttp://example.com!\nhttp://example.com?\nhttp://example.com)\nhttp://example.com/url_with_(brackets)\n(http://example.com/url_without_brackets)\nhttp://example.com/url_with_entity&\nhttp://example.com/url_with_entity&\nhttp://example.com/url_with_entity&\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\nhttp://example.com/url_with_entity\n;);
add("html2wt", "External links: URL in text", "URL in text:
http://example.com\n;);
add("html2wt", "External links: raw ampersand", "Old & use: http://x\n;);
add("html2wt", "External links: encoded ampersand", "Old use:
http://x\n;);
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index d8eb775..dbab4fb 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -4646,6 +4646,9 @@
http://example.com)
http://example.com/url_with_(brackets)
(http://example.com/url_without_brackets)
+http://example.com/url_with_entity;
+http://example.com/url_with_entity;
+http://example.com/url_with_entity;
http://example.com/url_with_entity;
http://example.com/url_with_entity;
http://example.com/url_with_entity;
@@ -4663,12 +4666,15 @@
http://example.com;>http://example.com)
http://example.com/url_with_(brackets)">http://example.com/url_with_(brackets)
(http://example.com/url_without_brackets;>http://example.com/url_without_brackets)
-http://example.com/url_with_entity ;>http://example.com/url_with_entity
-http://example.com/url_with_entity ;>http://example.com/url_with_entity
-http://example.com/url_with_entity ;>http://example.com/url_with_entity
+http://example.com/url_with_entity;>http://example.com/url_with_entity;
+http://example.com/url_with_entity;>http://example.com/url_with_entity;
+http://example.com/url_with_entity;>http://example.com/url_with_entity;
+http://example.com/url_with_entity;>http://example.com/url_with_entity
+http://example.com/url_with_entity;>http://example.com/url_with_entity
+http://example.com/url_with_entity;>http://example.com/url_with_entity
http://example.com/url_with_entity;>http://example.com/url_with_entity
-http://example.com/url_with_entity%3C;>http://example.com/url_with_entity%3C
-http://example.com/url_with_entity%3C;>http://example.com/url_with_entity%3C
+http://example.com/url_with_entity;>http://example.com/url_with_entity
+http://example.com/url_with_entity;>http://example.com/url_with_entity
!!
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I57d7dcac01db328cd733d2f05ee85bd0f8f88fe6
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 16 insertions(+), 26 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index b16a4d1..54037bf 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 = "30066c1de8d9bc870de59908175f9dc3d828f404";
+var expectedSHA1 = "077d8b70deb6d293ab7658db502cc54e220eb1fd";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "bef1ba5c712233cee98c564c58382a8aefdcb838";
+var latestCommit = "cc062f0e76a207310aba1b1ca514fbcb98b2f807";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5e870a4..ff63629 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -54,6 +54,7 @@
add("wt2html", "4. Indent-Pre and extension tags", "a gallery>\nFile:foobar.jpg\n/gallery>");
add("wt2html", "6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content", "a\n\n \nb\n\nc\n \nd");
add("wt2html", "Definition Lists: colons and tables 1", "\n
x\n\n\n
y\n");
+add("wt2html", "External links: Free with trailing punctuation", "http://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[0,18,0,0]}'>http://example.com,\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[20,38,0,0]}'>http://example.com;\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[40,58,0,0]}'>http://example.com\\\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[60,78,0,0]}'>http://example.com.\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[80,98,0,0]}'>http://example.com:\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[100,118,0,0]}'>http://example.com!\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[120,138,0,0]}'>http://example.com?\nhttp://example.com\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[140,158,0,0]}'>http://example.com)\nhttp://example.com/url_with_(brackets)\"
data-parsoid='{\"stx\":\"url\",\"dsr\":[160,198,0,0]}'>http://example.com/url_with_(brackets)\n(http://example.com/url_without_brackets\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[200,239,0,0]}'>http://example.com/url_without_brackets)\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity\"},\"sa\":{\"href\":\"http://example.com/url_with_entityamp;\"},\"dsr\":[241,280,0,0]}'>http://example.com/url_with_entity;\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#x26;\"},\"dsr\":[281,321,0,0]}'>http://example.com/url_with_entity;\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#038;\"},\"dsr\":[322,362,0,0]}'>http://example.com/url_with_entity;\nhttp://example.com/url_with_entity \;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity
\"},\"sa\":{\"href\":\"http://example.com/url_with_entitynbsp;\"},\"dsr\":[363,403,0,0]}'>http://example.com/url_with_entity
\nhttp://example.com/url_with_entity \;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity
\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#xA0;\"},\"dsr\":[404,444,0,0]}'>http://example.com/url_with_entity
\nhttp://example.com/url_with_entity \;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity
\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#160;\"},\"dsr\":[445,485,0,0]}'>http://example.com/url_with_entity
\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"dsr\":[486,520,0,0]}'>http://example.com/url_with_entity\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#x3C;\"},\"dsr\":[525,565,0,0]}'>http://example.com/url_with_entity;\nhttp://example.com/url_with_entity\;
data-parsoid='{\"stx\":\"url\",\"a\":{\"href\":\"http://example.com/url_with_entity\"},\"sa\":{\"href\":\"http://example.com/url_with_entity#60;\"},\"dsr\":[566,605,0,0]}'>http://example.com/url_with_entity;");
add("wt2html", "Bug 2702: Mismatched , and
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/237416
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I1f6ef5f5fc7bbdb733f339b7a58207044936eb7d
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/16/237416/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 6246579..b16a4d1 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 = "13ff973bf3d5b17f43999d14616f171bd3bfc4d7";
+var expectedSHA1 = "30066c1de8d9bc870de59908175f9dc3d828f404";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "23e2f64ec56df0749dc36ea786c2146af159ad26";
+var latestCommit = "bef1ba5c712233cee98c564c58382a8aefdcb838";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index df0590e..c8c63f3 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5711,7 +5711,7 @@
###
### Tables
###
-### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User's_Guide:_Using_tables
+### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide:_Using_tables
###
# This should not produce as
@@ -7396,7 +7396,7 @@
!! wikitext
[[Lista d''e paise d''o munno]]
!! html/php
-Lista
d''e paise d''o munno
+Lista
d''e paise d''o munno
!! html/parsoid
Lista d''e paise d''o munno
@@ -7433,10 +7433,10 @@
[[''Pentecoste''|''Pentecoste'']]
!! html/php
-File:Denys Savchenko
Pentecoste.jpg
-''Pentecoste''
-Pentecoste
-Pentecoste
+File:Denys Savchenko
Pentecoste.jpg
+''Pentecoste''
+Pentecoste
+Pentecoste
!! html/parsoid
@@ -14085,7 +14085,7 @@
!! wikitext
[[:Category:MediaWiki User's Guide]]
!! html
-Category:MediaWiki User's Guide
+Category:MediaWiki User's Guide
!! end
@@ -14096,7 +14096,7 @@
!! wikitext
[[Category:MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14115,7 +14115,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|Foo]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14125,7 +14125,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -19078,7 +19078,7 @@
!! wikitext
[[Category:МедиаWики Усер'с Гуиде]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
@@ -21043,7 +21043,7 @@
!! html
- http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
+ http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
caption
--
To view, visit https://gerrit.wikimedia.org/r/237416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f6ef5f5fc7bbdb733f339b7a58207044936eb7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
Change-Id: I1f6ef5f5fc7bbdb733f339b7a58207044936eb7d
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 6246579..b16a4d1 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 = "13ff973bf3d5b17f43999d14616f171bd3bfc4d7";
+var expectedSHA1 = "30066c1de8d9bc870de59908175f9dc3d828f404";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "23e2f64ec56df0749dc36ea786c2146af159ad26";
+var latestCommit = "bef1ba5c712233cee98c564c58382a8aefdcb838";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index df0590e..c8c63f3 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5711,7 +5711,7 @@
###
### Tables
###
-### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User's_Guide:_Using_tables
+### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide:_Using_tables
###
# This should not produce as
@@ -7396,7 +7396,7 @@
!! wikitext
[[Lista d''e paise d''o munno]]
!! html/php
-Lista
d''e paise d''o munno
+Lista
d''e paise d''o munno
!! html/parsoid
Lista d''e paise d''o munno
@@ -7433,10 +7433,10 @@
[[''Pentecoste''|''Pentecoste'']]
!! html/php
-File:Denys Savchenko
Pentecoste.jpg
-''Pentecoste''
-Pentecoste
-Pentecoste
+File:Denys Savchenko
Pentecoste.jpg
+''Pentecoste''
+Pentecoste
+Pentecoste
!! html/parsoid
@@ -14085,7 +14085,7 @@
!! wikitext
[[:Category:MediaWiki User's Guide]]
!! html
-Category:MediaWiki User's Guide
+Category:MediaWiki User's Guide
!! end
@@ -14096,7 +14096,7 @@
!! wikitext
[[Category:MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14115,7 +14115,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|Foo]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14125,7 +14125,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -19078,7 +19078,7 @@
!! wikitext
[[Category:МедиаWики Усер'с Гуиде]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
@@ -21043,7 +21043,7 @@
!! html
- http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
+ http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
caption
--
To view, visit https://gerrit.wikimedia.org/r/237416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f6ef5f5fc7bbdb733f339b7a58207044936eb7d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: Arlolra
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* No changes to blacklist
Change-Id: Ifdb5abbc31aed6ffe85206406e92b9697c9b30f4
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 14 insertions(+), 14 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 4782a43..6246579 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 = "926ca872bcb2445cc3490549daf229c9667c64a6";
+var expectedSHA1 = "13ff973bf3d5b17f43999d14616f171bd3bfc4d7";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cd3ddb1f595e740fe3b7049c31e52876656fabef";
+var latestCommit = "23e2f64ec56df0749dc36ea786c2146af159ad26";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fdd2579..8f83fc6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5711,7 +5711,7 @@
###
### Tables
###
-### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide:_Using_tables
+### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User's_Guide:_Using_tables
###
# This should not produce as
@@ -7385,7 +7385,7 @@
!! wikitext
[[Lista d''e paise d''o munno]]
!! html/php
-Lista
d''e paise d''o munno
+Lista
d''e paise d''o munno
!! html/parsoid
Lista d''e paise d''o munno
@@ -7422,10 +7422,10 @@
[[''Pentecoste''|''Pentecoste'']]
!! html/php
-File:Denys Savchenko
Pentecoste.jpg
-''Pentecoste''
-Pentecoste
-Pentecoste
+File:Denys Savchenko
Pentecoste.jpg
+''Pentecoste''
+Pentecoste
+Pentecoste
!! html/parsoid
@@ -14074,7 +14074,7 @@
!! wikitext
[[:Category:MediaWiki User's Guide]]
!! html
-Category:MediaWiki User's Guide
+Category:MediaWiki User's Guide
!! end
@@ -14085,7 +14085,7 @@
!! wikitext
[[Category:MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14104,7 +14104,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|Foo]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14114,7 +14114,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -19066,7 +19066,7 @@
!! wikitext
[[Category:МедиаWики Усер'с Гуиде]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
@@ -21022,7 +21022,7 @@
!! html
- http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
+ http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
caption
--
To view, visit https://gerrit.wikimedia.org/r/236825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifdb5abbc31aed6ffe85206406e92b9697c9b30f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry
Gerrit-Reviewer: Arlolra
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236825
Change subject: Sync parserTests with core
..
Sync parserTests with core
* No changes to blacklist
Change-Id: Ifdb5abbc31aed6ffe85206406e92b9697c9b30f4
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/25/236825/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 4782a43..6246579 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 = "926ca872bcb2445cc3490549daf229c9667c64a6";
+var expectedSHA1 = "13ff973bf3d5b17f43999d14616f171bd3bfc4d7";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "cd3ddb1f595e740fe3b7049c31e52876656fabef";
+var latestCommit = "23e2f64ec56df0749dc36ea786c2146af159ad26";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index fdd2579..8f83fc6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5711,7 +5711,7 @@
###
### Tables
###
-### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User%27s_Guide:_Using_tables
+### some content taken from
http://meta.wikimedia.org/wiki/MediaWiki_User's_Guide:_Using_tables
###
# This should not produce as
@@ -7385,7 +7385,7 @@
!! wikitext
[[Lista d''e paise d''o munno]]
!! html/php
-Lista
d''e paise d''o munno
+Lista
d''e paise d''o munno
!! html/parsoid
Lista d''e paise d''o munno
@@ -7422,10 +7422,10 @@
[[''Pentecoste''|''Pentecoste'']]
!! html/php
-File:Denys Savchenko
Pentecoste.jpg
-''Pentecoste''
-Pentecoste
-Pentecoste
+File:Denys Savchenko
Pentecoste.jpg
+''Pentecoste''
+Pentecoste
+Pentecoste
!! html/parsoid
@@ -14074,7 +14074,7 @@
!! wikitext
[[:Category:MediaWiki User's Guide]]
!! html
-Category:MediaWiki User's Guide
+Category:MediaWiki User's Guide
!! end
@@ -14085,7 +14085,7 @@
!! wikitext
[[Category:MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14104,7 +14104,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|Foo]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -14114,7 +14114,7 @@
!! wikitext
[[Category:MediaWiki User's Guide|MediaWiki User's Guide]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
!! test
@@ -19066,7 +19066,7 @@
!! wikitext
[[Category:МедиаWики Усер'с Гуиде]]
!! html
-MediaWiki User's Guide
+MediaWiki User's Guide
!! end
@@ -21022,7 +21022,7 @@
!! html
- http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
+ http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width="120" height="14"
srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x"
/>
caption
--
To view, visit https://gerrit.wikimedia.org/r/236825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifdb5abbc31aed6ffe85206406e92b9697c9b30f4
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Updated blacklist
Change-Id: I48afe69dfaa2c3c79d3f50c5a0d8bacb3f2e3524
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 29 insertions(+), 39 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 a219678..4782a43 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 = "a9c88d043175aa2f2cf08ea270da2388380237c3";
+var expectedSHA1 = "926ca872bcb2445cc3490549daf229c9667c64a6";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "bb281c0317006ecfc4a3414d8ef1a4d2b2349b31";
+var latestCommit = "cd3ddb1f595e740fe3b7049c31e52876656fabef";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index d2555ce..260d6e4 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -108,6 +108,7 @@
add("wt2html", "Template infinite loop", "");
add("wt2html", "Template with targets containing wikilinks", "{{foo}}\n\n{{foo}}\n\nWarning:
Page/template fetching disabled, and no cache for
Template:[[foo]]");
add("wt2html", "int keyword", "Parser function
implementation for pf_int missing in Parsoid.");
+add("wt2html", "int keyword - non-existing message", "Parser
function implementation for pf_int missing in Parsoid.");
add("wt2html", "Self-closed noinclude, includeonly, onlyinclude tags", "\n\n");
add("wt2html", "Bug 6563: Section extraction for section shown by
", "\nSection T-2");
add("wt2html", "Bug 6563: Section extraction for section suppressed by
", "\nSection 1");
@@ -306,8 +307,8 @@
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
add("wt2html", "Links 3. WikiLinks: No escapes needed", "[[Foo|[Foobar]]\nfoo|bar");
add("wt2html", "1. a tags", "a
href=\"http://google.com\;>google/a>");
-add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "{{}}");
-add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "}}{{");
+add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "{{}}");
+add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "}}{{");
add("wt2html", "Empty table rows go away", "\n Hello\n
there\n\n\n");
add("wt2html", "RT-ed inter-element separators should be valid separators",
"\n\n");
@@ -415,7 +416,6 @@
add("wt2wt", "References: 9. Generate missing references list at the end", "A
foo\nB bar\n\n");
add("wt2wt", "Entities in ref name", "hi\n");
add("wt2wt", "HTML tag with broken attribute value quoting", "Foo\n");
-add("wt2wt", "Parsoid-only: HTML tag with broken attribute value quoting",
"Foo\n");
add("wt2wt", "Table with broken attribute value quoting", "{|\n| title=\"Hello
world\" |Foo\n|}");
add("wt2wt", "Table with broken attribute value quoting on consecutive lines",
"{|\n| title=\"Hello world\" |Foo\n| style=\"color:red\" |Bar\n|}");
add("wt2wt", "RT-ed inter-element separators should be valid separators",
"{|\n|- [ foo]]\n|}");
@@ -657,7 +657,7 @@
add("html2html", "Bug 33845 (2): Headings become bold in TOC when they contain
a blockquote", "\n\n\n Contents \n\n\n 1 Quote\n\n\n\n\n\nQuote\n\n[[/index.php?title=Main_Pageaction=editsection=1
edit]]\n");
add("html2html", "Unclosed tags in TOC", "\n Contents \n\n\n 1 Proof: 2
3\n\n\n\n
Proof: 2 3 \nHanc marginis exiguitas
non caperet.\nQED\n");
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", "Tags with parameters in TOC", "\n Contents \n\n\n 1 Hello\n 2
b\">Evilbye\n\n\n\n Hello
\n\n b\">Evilbye
\n");
+add("html2html", "Tags with parameters in TOC", "\n Contents \n\n\n 1 Hello\n 2
b\">Evilbye\n\n\n\n Hello
\n\n b\">Evilbye
\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
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/235530
Change subject: Sync parserTests with core
..
Sync parserTests with core
* Updated blacklist
Change-Id: I48afe69dfaa2c3c79d3f50c5a0d8bacb3f2e3524
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 29 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/30/235530/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index a219678..4782a43 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 = "a9c88d043175aa2f2cf08ea270da2388380237c3";
+var expectedSHA1 = "926ca872bcb2445cc3490549daf229c9667c64a6";
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = "bb281c0317006ecfc4a3414d8ef1a4d2b2349b31";
+var latestCommit = "cd3ddb1f595e740fe3b7049c31e52876656fabef";
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index d2555ce..260d6e4 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -108,6 +108,7 @@
add("wt2html", "Template infinite loop", "");
add("wt2html", "Template with targets containing wikilinks", "{{foo}}\n\n{{foo}}\n\nWarning:
Page/template fetching disabled, and no cache for
Template:[[foo]]");
add("wt2html", "int keyword", "Parser function
implementation for pf_int missing in Parsoid.");
+add("wt2html", "int keyword - non-existing message", "Parser
function implementation for pf_int missing in Parsoid.");
add("wt2html", "Self-closed noinclude, includeonly, onlyinclude tags", "\n\n");
add("wt2html", "Bug 6563: Section extraction for section shown by
", "\nSection T-2");
add("wt2html", "Bug 6563: Section extraction for section suppressed by
", "\nSection 1");
@@ -306,8 +307,8 @@
add("wt2html", "1. SOL-sensitive wikitext tokens as template-args", "*a\n#a\n:a");
add("wt2html", "Links 3. WikiLinks: No escapes needed", "[[Foo|[Foobar]]\nfoo|bar");
add("wt2html", "1. a tags", "a
href=\"http://google.com\;>google/a>");
-add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "{{}}");
-add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "}}{{");
+add("wt2html", "2. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "{{}}");
+add("wt2html", "1. Parsoid-only: Don't wrap broken template tags in
on wt2wt (Bug 42353)", "}}{{");
add("wt2html", "Empty table rows go away", "\n Hello\n
there\n\n\n");
add("wt2html", "RT-ed inter-element separators should be valid separators",
"\n\n");
@@ -415,7 +416,6 @@
add("wt2wt", "References: 9. Generate missing references list at the end", "A
foo\nB bar\n\n");
add("wt2wt", "Entities in ref name", "hi\n");
add("wt2wt", "HTML tag with broken attribute value quoting", "Foo\n");
-add("wt2wt", "Parsoid-only: HTML tag with broken attribute value quoting",
"Foo\n");
add("wt2wt", "Table with broken attribute value quoting", "{|\n| title=\"Hello
world\" |Foo\n|}");
add("wt2wt", "Table with broken attribute value quoting on consecutive lines",
"{|\n| title=\"Hello world\" |Foo\n| style=\"color:red\" |Bar\n|}");
add("wt2wt", "RT-ed inter-element separators should be valid separators",
"{|\n|- [ foo]]\n|}");
@@ -657,7 +657,7 @@
add("html2html", "Bug 33845 (2): Headings become bold in TOC when they contain
a blockquote", "\n\n\n Contents \n\n\n 1 Quote\n\n\n\n\n\nQuote\n\n[[/index.php?title=Main_Pageaction=editsection=1
edit]]\n");
add("html2html", "Unclosed tags in TOC", "\n Contents \n\n\n 1 Proof: 2
3\n\n\n\n
Proof: 2 3 \nHanc marginis exiguitas
non caperet.\nQED\n");
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", "Tags with parameters in TOC", "\n Contents \n\n\n 1 Hello\n 2
b\">Evilbye\n\n\n\n Hello
\n\n b\">Evilbye
\n");
+add("html2html", "Tags with parameters in TOC", "\n Contents \n\n\n 1 Hello\n 2
b\">Evilbye\n\n\n\n Hello
\n\n b\">Evilbye
\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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232412
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit bb281c0317006ecfc4a3414d8ef1a4d2b2349b31.
New blacklist entries due to T23261 (IPv6 URLs) and
T106578/T106079 (Illegal HTML5 character entities).
Change-Id: Ia5e062faae75727fac0ccaf48beb8f984e91dc01
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 147 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/12/232412/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index e163efd..a219678 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 = 6318a631297f9fe85a3b5356d7481f10f814c5c3;
+var expectedSHA1 = a9c88d043175aa2f2cf08ea270da2388380237c3;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 59e8147b67f2d9b3d6db6132917b27ea2463e8aa;
+var latestCommit = bb281c0317006ecfc4a3414d8ef1a4d2b2349b31;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 7121684..f5b3397 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -54,6 +54,8 @@
add(wt2html, Definition Lists: colons and tables 1, dl
data-parsoid='{\dsr\:[0,21,0,0]}'dd
data-parsoid='{\dsr\:[0,10,1,0]}'table
data-parsoid='{\dsr\:[1,10,2,2]}'\ntbody
data-parsoid='{\dsr\:[4,8,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[4,7,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[4,7,1,0]}'
x/td/tr\n/tbody/table/dd\ndd
data-parsoid='{\dsr\:[11,21,1,0]}'table
data-parsoid='{\dsr\:[12,21,2,2]}'\ntbody
data-parsoid='{\dsr\:[15,19,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[15,18,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[15,18,1,0]}'
y/td/tr\n/tbody/table/dd/dl);
add(wt2html, Bug 2702: Mismatched i, b and a tags are invalid, p
data-parsoid='{\dsr\:[0,204,0,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[0,29,2,0]}'a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:22,\contentOffsets\:[22,28],\dsr\:[2,29,20,1]}'texti
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[26,28,2,0]}'/i/a/i\na
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:50,\contentOffsets\:[50,57],\dsr\:[30,58,20,1]}'b
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[50,57,3,0]}'text/b/ab
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[58,61,3,0]}'/b\ni
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[62,106,2,0]}'Something a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:94,\contentOffsets\:[94,105],\dsr\:[74,106,20,1]}'in
italici
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[103,105,2,0]}'/i/a/i\ni
data-parsoid='{\dsr\:[107,164,2,2]}'Something a rel=\mw:ExtLink\
href=\http://example.com\;
data-parsoid='{\targetOff\:139,\contentOffsets\:[139,160],\dsr\:[119,161,20,1]}'mixedb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[144,160,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[147,160,2,0]}', even
bold/i/b/a'/i\nb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[165,204,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[168,204,2,0]}'Now a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:194,\contentOffsets\:[194,203],\dsr\:[174,204,20,1]}'bothb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[198,203,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[201,203,2,0]}'/i/b/a/i/b/p);
add(wt2html, External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check), p data-parsoid='{\dsr\:[0,60,0,0]}'i
data-parsoid='{\dsr\:[0,60,2,2]}'Some a rel=\mw:ExtLink\
href=\http://example.com/\;
data-parsoid='{\targetOff\:28,\contentOffsets\:[28,56],\dsr\:[7,57,21,1]}'pretty
i data-parsoid='{\dsr\:[35,46,2,2]}'italics/i and stuff/a!/i/p);
+add(wt2html, IPv6 urls, autolink format (T23261), p
data-parsoid='{\dsr\:[0,41,0,0]}'a rel=\mw:ExtLink\
href=\http://[2404:130:0:1000::187:2]/index.php\;
data-parsoid='{\stx\:\url\,\dsr\:[0,41,0,0]}'http://[2404:130:0:1000::187:2]/index.php/a/p\n\np
data-parsoid='{\dsr\:[43,78,0,0]}'Examples from RFC2373, section
2.2:/p\nul data-parsoid='{\dsr\:[79,277,0,0]}'li
data-parsoid='{\dsr\:[79,119,1,0]}'
http://[1080::8:800:200C:417A]/unicast/li\nli
data-parsoid='{\dsr\:[120,150,1,0]}' http://[FF01::101]/multicast/li\nli
data-parsoid='{\dsr\:[151,174,1,0]}' http://[::1]/loopback/li\nli
data-parsoid='{\dsr\:[175,200,1,0]}' http://[::]/unspecified/li\nli
data-parsoid='{\dsr\:[201,234,1,0]}'
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 bb281c0317006ecfc4a3414d8ef1a4d2b2349b31.
New blacklist entries due to T23261 (IPv6 URLs) and
T106578/T106079 (Illegal HTML5 character entities).
Change-Id: Ia5e062faae75727fac0ccaf48beb8f984e91dc01
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 147 insertions(+), 8 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 e163efd..a219678 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 = 6318a631297f9fe85a3b5356d7481f10f814c5c3;
+var expectedSHA1 = a9c88d043175aa2f2cf08ea270da2388380237c3;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 59e8147b67f2d9b3d6db6132917b27ea2463e8aa;
+var latestCommit = bb281c0317006ecfc4a3414d8ef1a4d2b2349b31;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 7121684..f5b3397 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -54,6 +54,8 @@
add(wt2html, Definition Lists: colons and tables 1, dl
data-parsoid='{\dsr\:[0,21,0,0]}'dd
data-parsoid='{\dsr\:[0,10,1,0]}'table
data-parsoid='{\dsr\:[1,10,2,2]}'\ntbody
data-parsoid='{\dsr\:[4,8,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[4,7,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[4,7,1,0]}'
x/td/tr\n/tbody/table/dd\ndd
data-parsoid='{\dsr\:[11,21,1,0]}'table
data-parsoid='{\dsr\:[12,21,2,2]}'\ntbody
data-parsoid='{\dsr\:[15,19,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[15,18,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[15,18,1,0]}'
y/td/tr\n/tbody/table/dd/dl);
add(wt2html, Bug 2702: Mismatched i, b and a tags are invalid, p
data-parsoid='{\dsr\:[0,204,0,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[0,29,2,0]}'a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:22,\contentOffsets\:[22,28],\dsr\:[2,29,20,1]}'texti
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[26,28,2,0]}'/i/a/i\na
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:50,\contentOffsets\:[50,57],\dsr\:[30,58,20,1]}'b
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[50,57,3,0]}'text/b/ab
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[58,61,3,0]}'/b\ni
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[62,106,2,0]}'Something a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:94,\contentOffsets\:[94,105],\dsr\:[74,106,20,1]}'in
italici
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[103,105,2,0]}'/i/a/i\ni
data-parsoid='{\dsr\:[107,164,2,2]}'Something a rel=\mw:ExtLink\
href=\http://example.com\;
data-parsoid='{\targetOff\:139,\contentOffsets\:[139,160],\dsr\:[119,161,20,1]}'mixedb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[144,160,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[147,160,2,0]}', even
bold/i/b/a'/i\nb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[165,204,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[168,204,2,0]}'Now a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:194,\contentOffsets\:[194,203],\dsr\:[174,204,20,1]}'bothb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[198,203,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[201,203,2,0]}'/i/b/a/i/b/p);
add(wt2html, External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check), p data-parsoid='{\dsr\:[0,60,0,0]}'i
data-parsoid='{\dsr\:[0,60,2,2]}'Some a rel=\mw:ExtLink\
href=\http://example.com/\;
data-parsoid='{\targetOff\:28,\contentOffsets\:[28,56],\dsr\:[7,57,21,1]}'pretty
i data-parsoid='{\dsr\:[35,46,2,2]}'italics/i and stuff/a!/i/p);
+add(wt2html, IPv6 urls, autolink format (T23261), p
data-parsoid='{\dsr\:[0,41,0,0]}'a rel=\mw:ExtLink\
href=\http://[2404:130:0:1000::187:2]/index.php\;
data-parsoid='{\stx\:\url\,\dsr\:[0,41,0,0]}'http://[2404:130:0:1000::187:2]/index.php/a/p\n\np
data-parsoid='{\dsr\:[43,78,0,0]}'Examples from RFC2373, section
2.2:/p\nul data-parsoid='{\dsr\:[79,277,0,0]}'li
data-parsoid='{\dsr\:[79,119,1,0]}'
http://[1080::8:800:200C:417A]/unicast/li\nli
data-parsoid='{\dsr\:[120,150,1,0]}' http://[FF01::101]/multicast/li\nli
data-parsoid='{\dsr\:[151,174,1,0]}' http://[::1]/loopback/li\nli
data-parsoid='{\dsr\:[175,200,1,0]}' http://[::]/unspecified/li\nli
data-parsoid='{\dsr\:[201,234,1,0]}'
http://[::13.1.68.3]/ipv4compat/li\nli
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232211
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit 59e8147b67f2d9b3d6db6132917b27ea2463e8aa.
Bare protocols are no longer autolinked (T105697). Parsoid has not been
updated to match core yet (T106945), so this newly-added parser test goes
on the blacklist for now.
Change-Id: I4a6ba328fa8d7a9860203417e41a1c7e7c5a4fb0
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 25 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/11/232211/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 430f9d1..e163efd 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 = 2561c5b800e5b029c5e3e301b5d5e0a54216ae60;
+var expectedSHA1 = 6318a631297f9fe85a3b5356d7481f10f814c5c3;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = eade3aedf59b8263849d07d4d2f99d237a4c93f4;
+var latestCommit = 59e8147b67f2d9b3d6db6132917b27ea2463e8aa;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5802270..d72545c 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -52,6 +52,7 @@
add(wt2html, 4. Indent-Pre and extension tags, pre
data-parsoid='{\dsr\:[0,39,1,0]}'a span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[3,39,9,0]}'lt;gallery\nFile:foobar.jpg\nlt;/gallery/span/pre);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content, pre
data-parsoid='{\dsr\:[0,26,1,0]}'a\n\n !-- continue --\nb/pre\n\npre
data-parsoid='{\dsr\:[28,30,1,0]}'c/pre\n \np
data-parsoid='{\dsr\:[33,34,0,0]}'d/p);
add(wt2html, Definition Lists: colons and tables 1, dl
data-parsoid='{\dsr\:[0,21,0,0]}'dd
data-parsoid='{\dsr\:[0,10,1,0]}'table
data-parsoid='{\dsr\:[1,10,2,2]}'\ntbody
data-parsoid='{\dsr\:[4,8,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[4,7,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[4,7,1,0]}'
x/td/tr\n/tbody/table/dd\ndd
data-parsoid='{\dsr\:[11,21,1,0]}'table
data-parsoid='{\dsr\:[12,21,2,2]}'\ntbody
data-parsoid='{\dsr\:[15,19,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[15,18,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[15,18,1,0]}'
y/td/tr\n/tbody/table/dd/dl);
+add(wt2html, External links: Lone protocols are never linked (T105697),
p data-parsoid='{\dsr\:[0,56,0,0]}'http://\na rel=\mw:ExtLink\
href=\http://\;
data-parsoid='{\stx\:\url\,\dsr\:[8,15,0,0]}'http:///a;\n(a
rel=\mw:ExtLink\ href=\http://\;
data-parsoid='{\stx\:\url\,\dsr\:[18,25,0,0]}'http:///a)\nbitcoin:\nbitcoin:;\n(bitcoin:)/p);
add(wt2html, Bug 2702: Mismatched i, b and a tags are invalid, p
data-parsoid='{\dsr\:[0,204,0,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[0,29,2,0]}'a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:22,\contentOffsets\:[22,28],\dsr\:[2,29,20,1]}'texti
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[26,28,2,0]}'/i/a/i\na
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:50,\contentOffsets\:[50,57],\dsr\:[30,58,20,1]}'b
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[50,57,3,0]}'text/b/ab
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[58,61,3,0]}'/b\ni
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[62,106,2,0]}'Something a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:94,\contentOffsets\:[94,105],\dsr\:[74,106,20,1]}'in
italici
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[103,105,2,0]}'/i/a/i\ni
data-parsoid='{\dsr\:[107,164,2,2]}'Something a rel=\mw:ExtLink\
href=\http://example.com\;
data-parsoid='{\targetOff\:139,\contentOffsets\:[139,160],\dsr\:[119,161,20,1]}'mixedb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[144,160,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[147,160,2,0]}', even
bold/i/b/a'/i\nb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[165,204,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[168,204,2,0]}'Now a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:194,\contentOffsets\:[194,203],\dsr\:[174,204,20,1]}'bothb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[198,203,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[201,203,2,0]}'/i/b/a/i/b/p);
add(wt2html, External link containing double-single-quotes in text embedded
in
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 59e8147b67f2d9b3d6db6132917b27ea2463e8aa.
Bare protocols are no longer autolinked (T105697). Parsoid has not been
updated to match core yet (T106945), so this newly-added parser test goes
on the blacklist for now.
Change-Id: I4a6ba328fa8d7a9860203417e41a1c7e7c5a4fb0
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 25 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 430f9d1..e163efd 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 = 2561c5b800e5b029c5e3e301b5d5e0a54216ae60;
+var expectedSHA1 = 6318a631297f9fe85a3b5356d7481f10f814c5c3;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = eade3aedf59b8263849d07d4d2f99d237a4c93f4;
+var latestCommit = 59e8147b67f2d9b3d6db6132917b27ea2463e8aa;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5802270..d72545c 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -52,6 +52,7 @@
add(wt2html, 4. Indent-Pre and extension tags, pre
data-parsoid='{\dsr\:[0,39,1,0]}'a span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[3,39,9,0]}'lt;gallery\nFile:foobar.jpg\nlt;/gallery/span/pre);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content, pre
data-parsoid='{\dsr\:[0,26,1,0]}'a\n\n !-- continue --\nb/pre\n\npre
data-parsoid='{\dsr\:[28,30,1,0]}'c/pre\n \np
data-parsoid='{\dsr\:[33,34,0,0]}'d/p);
add(wt2html, Definition Lists: colons and tables 1, dl
data-parsoid='{\dsr\:[0,21,0,0]}'dd
data-parsoid='{\dsr\:[0,10,1,0]}'table
data-parsoid='{\dsr\:[1,10,2,2]}'\ntbody
data-parsoid='{\dsr\:[4,8,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[4,7,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[4,7,1,0]}'
x/td/tr\n/tbody/table/dd\ndd
data-parsoid='{\dsr\:[11,21,1,0]}'table
data-parsoid='{\dsr\:[12,21,2,2]}'\ntbody
data-parsoid='{\dsr\:[15,19,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[15,18,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[15,18,1,0]}'
y/td/tr\n/tbody/table/dd/dl);
+add(wt2html, External links: Lone protocols are never linked (T105697),
p data-parsoid='{\dsr\:[0,56,0,0]}'http://\na rel=\mw:ExtLink\
href=\http://\;
data-parsoid='{\stx\:\url\,\dsr\:[8,15,0,0]}'http:///a;\n(a
rel=\mw:ExtLink\ href=\http://\;
data-parsoid='{\stx\:\url\,\dsr\:[18,25,0,0]}'http:///a)\nbitcoin:\nbitcoin:;\n(bitcoin:)/p);
add(wt2html, Bug 2702: Mismatched i, b and a tags are invalid, p
data-parsoid='{\dsr\:[0,204,0,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[0,29,2,0]}'a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:22,\contentOffsets\:[22,28],\dsr\:[2,29,20,1]}'texti
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[26,28,2,0]}'/i/a/i\na
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:50,\contentOffsets\:[50,57],\dsr\:[30,58,20,1]}'b
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[50,57,3,0]}'text/b/ab
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[58,61,3,0]}'/b\ni
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[62,106,2,0]}'Something a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:94,\contentOffsets\:[94,105],\dsr\:[74,106,20,1]}'in
italici
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[103,105,2,0]}'/i/a/i\ni
data-parsoid='{\dsr\:[107,164,2,2]}'Something a rel=\mw:ExtLink\
href=\http://example.com\;
data-parsoid='{\targetOff\:139,\contentOffsets\:[139,160],\dsr\:[119,161,20,1]}'mixedb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[144,160,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[147,160,2,0]}', even
bold/i/b/a'/i\nb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[165,204,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[168,204,2,0]}'Now a
rel=\mw:ExtLink\ href=\http://example.com\;
data-parsoid='{\targetOff\:194,\contentOffsets\:[194,203],\dsr\:[174,204,20,1]}'bothb
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[198,203,3,0]}'i
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[201,203,2,0]}'/i/b/a/i/b/p);
add(wt2html, External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check), p
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 eade3aedf59b8263849d07d4d2f99d237a4c93f4.
Upstream landed a tweak to how empty attributes were handled (T54330),
which necessitated a sync.
A number of tests were removed from the blacklist because they were
marked php-only in core.
Change-Id: I519d761dee9e96fbabf56069a3171f8c11c25293
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 33 insertions(+), 30 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 cf9628e..430f9d1 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 = 240ed998de2f712212612f5b39bb9a393f2457ff;
+var expectedSHA1 = 2561c5b800e5b029c5e3e301b5d5e0a54216ae60;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e51fe526290f9a99ab3acd3305311b94a327a4a3;
+var latestCommit = eade3aedf59b8263849d07d4d2f99d237a4c93f4;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index aa46d3c..016edb5 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -166,7 +166,6 @@
add(wt2html, Media link to nonexistent file (bug 1702), p
data-parsoid='{\dsr\:[0,21,0,0]}'a rel=\mw:WikiLink\
href=\./Media:No_such.jpg\ title=\Media:No such.jpg\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./Media:No_such.jpg\},\sa\:{\href\:\Media:No
such.jpg\},\dsr\:[0,21,2,2]}'Media:No such.jpg/a/p);
add(wt2html, (bug 19451) Links should refer to the normalized form., p
data-parsoid='{\dsr\:[0,64,0,0]}'a rel=\mw:WikiLink\ href=\./אַ\
title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#xFB2E;\},\dsr\:[0,12,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#x5d0;amp;#x5b7;\},\dsr\:[13,31,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#x5d0;ַ\},\dsr\:[32,44,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\אamp;#x5b7;\},\dsr\:[45,57,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\אַ\},\dsr\:[58,64,2,2]}'אַ/a/p);
add(wt2html, Attribute test: equals, then nothing, p
data-parsoid='{\dsr\:[0,23,0,0]}'font color=\\
data-parsoid='{\stx\:\html\,\dsr\:[0,23,13,7]}'foo/font/p);
-add(wt2html, Attribute test: no value, p
data-parsoid='{\dsr\:[0,22,0,0]}'font color=\\
data-parsoid='{\stx\:\html\,\dsr\:[0,22,12,7]}'foo/font/p);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,55,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'Magic
div/div);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,56,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:
lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'Magic
div/div);
add(wt2html, CSS safety test (all browsers): vertical tab (bug 55332 /
CVE-2013-4567), p style=\/* insecure input */\
data-parsoid='{\stx\:\html\,\a\:{\style\:\/* insecure input
*/\},\sa\:{\style\:\font-size: 100px;
background-image:urlb(https://www.google.com/images/srpr/logo6w.png)\},\dsr\:[0,104,99,4]}'A/p);
@@ -283,7 +282,7 @@
add(wt2html, Bad images - basic functionality, p
data-parsoid='{\dsr\:[0,16,0,0]}'span class=\mw-default-size\
typeof=\mw:Error mw:Image\
data-parsoid='{\optList\:[],\dsr\:[0,16,null,null]}'
data-mw='{\errors\:[{\key\:\missing-image\,\message\:\This image does
not exist.\}]}'a href=\./File:Bad.jpg\
data-parsoid='{\a\:{\href\:\./File:Bad.jpg\},\sa\:{}}'img
resource=\./File:Bad.jpg\ src=\./Special:FilePath/Bad.jpg\ height=\220\
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/229161
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit eade3aedf59b8263849d07d4d2f99d237a4c93f4.
Upstream landed a tweak to how empty attributes were handled (T54330),
which necessitated a sync.
A number of tests were removed from the blacklist because they were
marked php-only in core.
Change-Id: I519d761dee9e96fbabf56069a3171f8c11c25293
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 33 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/61/229161/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index cf9628e..430f9d1 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 = 240ed998de2f712212612f5b39bb9a393f2457ff;
+var expectedSHA1 = 2561c5b800e5b029c5e3e301b5d5e0a54216ae60;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e51fe526290f9a99ab3acd3305311b94a327a4a3;
+var latestCommit = eade3aedf59b8263849d07d4d2f99d237a4c93f4;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index aa46d3c..016edb5 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -166,7 +166,6 @@
add(wt2html, Media link to nonexistent file (bug 1702), p
data-parsoid='{\dsr\:[0,21,0,0]}'a rel=\mw:WikiLink\
href=\./Media:No_such.jpg\ title=\Media:No such.jpg\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./Media:No_such.jpg\},\sa\:{\href\:\Media:No
such.jpg\},\dsr\:[0,21,2,2]}'Media:No such.jpg/a/p);
add(wt2html, (bug 19451) Links should refer to the normalized form., p
data-parsoid='{\dsr\:[0,64,0,0]}'a rel=\mw:WikiLink\ href=\./אַ\
title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#xFB2E;\},\dsr\:[0,12,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#x5d0;amp;#x5b7;\},\dsr\:[13,31,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\amp;#x5d0;ַ\},\dsr\:[32,44,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\אamp;#x5b7;\},\dsr\:[45,57,2,2]}'אַ/a\na
rel=\mw:WikiLink\ href=\./אַ\ title=\אַ\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\./אַ\},\sa\:{\href\:\אַ\},\dsr\:[58,64,2,2]}'אַ/a/p);
add(wt2html, Attribute test: equals, then nothing, p
data-parsoid='{\dsr\:[0,23,0,0]}'font color=\\
data-parsoid='{\stx\:\html\,\dsr\:[0,23,13,7]}'foo/font/p);
-add(wt2html, Attribute test: no value, p
data-parsoid='{\dsr\:[0,22,0,0]}'font color=\\
data-parsoid='{\stx\:\html\,\dsr\:[0,22,12,7]}'foo/font/p);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,55,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'Magic
div/div);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,56,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:
lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'Magic
div/div);
add(wt2html, CSS safety test (all browsers): vertical tab (bug 55332 /
CVE-2013-4567), p style=\/* insecure input */\
data-parsoid='{\stx\:\html\,\a\:{\style\:\/* insecure input
*/\},\sa\:{\style\:\font-size: 100px;
background-image:urlb(https://www.google.com/images/srpr/logo6w.png)\},\dsr\:[0,104,99,4]}'A/p);
@@ -283,7 +282,7 @@
add(wt2html, Bad images - basic functionality, p
data-parsoid='{\dsr\:[0,16,0,0]}'span class=\mw-default-size\
typeof=\mw:Error mw:Image\
data-parsoid='{\optList\:[],\dsr\:[0,16,null,null]}'
data-mw='{\errors\:[{\key\:\missing-image\,\message\:\This image does
not exist.\}]}'a href=\./File:Bad.jpg\
data-parsoid='{\a\:{\href\:\./File:Bad.jpg\},\sa\:{}}'img
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223848
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(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/48/223848/1
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\bditest/bdi/span]]\n\n/div\n\n== bditest/bdi
==\n);
add(html2wt, Empty p tag in TOC, removed by Sanitizer (T92892), \ndiv
id=\toc\ class=\toc\\ndiv 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
-pa href=/wiki/Foo%7Ebar title=Foo~barFoo~bar/a
+pa href=/wiki/Foo~bar title=Foo~barFoo~bar/a
/p
!! html/parsoid
pa rel=mw:WikiLink href=./Foo~bar title=Foo~barFoo~bar/a/p
@@ -20370,10 +20370,12 @@
{{urlencode:xnowiki/y}}
{{urlencode:xnowiki/y|wiki}}
{{urlencode:xnowiki/y|path}}
+{{urlencode:xpre id=onetwo/prey}}
!! html
pxy
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: newchange
Gerrit-Change-Id: I18813035a694f6febd9349930573d9ebd7fdd687
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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\bditest/bdi/span]]\n\n/div\n\n== bditest/bdi
==\n);
add(html2wt, Empty p tag in TOC, removed by Sanitizer (T92892), \ndiv
id=\toc\ class=\toc\\ndiv 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
-pa href=/wiki/Foo%7Ebar title=Foo~barFoo~bar/a
+pa href=/wiki/Foo~bar title=Foo~barFoo~bar/a
/p
!! html/parsoid
pa rel=mw:WikiLink href=./Foo~bar title=Foo~barFoo~bar/a/p
@@ -20370,10 +20370,12 @@
{{urlencode:xnowiki/y}}
{{urlencode:xnowiki/y|wiki}}
{{urlencode:xnowiki/y|path}}
+{{urlencode:xpre id=onetwo/prey}}
!! html
pxy
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 canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/223723
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit 539f1878be0938d3a037c6e06ae55cae3b73e08c.
Upstream added new tests for TOC behavior (T96153) and LanguageConverter
(I2c88f1cf7c0014bebf5c798916b660b334a0b78b), neither of which is relevant
to Parsoid at the current time.
The LanguageConverter tests have been added to the blacklist, since we
will eventually support LanguageConverter.
The TOC tests have been marked php-only, since we have no plan to include
TOC generation in Parsoid at this time. This results in some tests being
removed from the blacklist.
Change-Id: I5518c05bca3671c67a3462350aaf977274302cdf
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 87 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/23/223723/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 6b880bf..563cf18 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 = 1dd1c769fc68d6ea7a8ae12aad04e657470223d3;
+var expectedSHA1 = 4717c2ba6555452bfc0525d2551b1776ec723b47;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 278c83af8b2426d95f578e01e3bc679abf7b9d4b;
+var latestCommit = 1c4a8ff314ae894a5dae23cd1c6b76b4e82bac49;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index c947ac9..ea4bd57 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -287,7 +287,6 @@
add(wt2html, Gallery with wikitext inside caption, p
data-parsoid='{\dsr\:[0,156,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg|[[File:foobar.jpg|20px|desc|alt=inneralt]]|alt=galleryalt\\nFile:foobar.jpg|{{Test|unamedParam|alt=param}}|alt=galleryalt\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[0,156,9,0]}'lt;gallery\nFile:foobar.jpg|[[File:foobar.jpg|20px|desc|alt=inneralt]]|alt=galleryalt\nFile:foobar.jpg|{{Test|unamedParam|alt=param}}|alt=galleryalt\nlt;/gallery/span/p);
add(wt2html, gallery (with showfilename option), p
data-parsoid='{\dsr\:[0,149,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\ data-parsoid='{\stx\:\html\,\src\:\lt;gallery
showfilename\\nFile:Nonexistent.jpg|caption\\nFile:Nonexistent.jpg\\nimage:foobar.jpg|some
#39;#39;#39;caption#39;#39;#39; [[Main
Page]]\\nFile:Foobar.jpg\\nlt;/gallery\,\tagWidths\:[22,10],\autoInsertedEnd\:true,\dsr\:[0,149,22,0]}'lt;gallery
showfilename\nFile:Nonexistent.jpg|caption\nFile:Nonexistent.jpg\nimage:foobar.jpg|some
'''caption''' [[Main Page]]\nFile:Foobar.jpg\nlt;/gallery/span/p);
add(wt2html, Gallery (with namespace-less filenames), p
data-parsoid='{\dsr\:[0,85,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:Nonexistent.jpg\\nNonexistent.jpg\\nimage:foobar.jpg\\nfoobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[0,85,9,0]}'lt;gallery\nFile:Nonexistent.jpg\nNonexistent.jpg\nimage:foobar.jpg\nfoobar.jpg\nlt;/gallery/span/p);
-add(wt2html, __FORCETOC__ override, meta
property=\mw:PageProp/newsectionlink\
data-parsoid='{\src\:\__NEWSECTIONLINK__\,\magicSrc\:\__NEWSECTIONLINK__\,\dsr\:[0,18,null,null]}'/\nmeta
property=\mw:PageProp/forcetoc\
data-parsoid='{\src\:\__FORCETOC__\,\magicSrc\:\__FORCETOC__\,\dsr\:[19,31,null,null]}'/);
add(wt2html, Centre-aligned image, figure class=\mw-default-size
mw-halign-center\ typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\center\,\ak\:\centre\}],\dsr\:[0,27,2,2]}'a
href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\sa\:{},\dsr\:[2,25,null,null]}'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\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/figure);
add(wt2html, None-aligned image, figure class=\mw-default-size
mw-halign-none\ typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\none\,\ak\:\none\}],\dsr\:[0,25,2,2]}'a
href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\sa\:{},\dsr\:[2,23,null,null]}'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\
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 539f1878be0938d3a037c6e06ae55cae3b73e08c.
Upstream added new tests for TOC behavior (T96153) and LanguageConverter
(I2c88f1cf7c0014bebf5c798916b660b334a0b78b), neither of which is relevant
to Parsoid at the current time.
The LanguageConverter tests have been added to the blacklist, since we
will eventually support LanguageConverter.
The TOC tests have been marked php-only, since we have no plan to include
TOC generation in Parsoid at this time. This results in some tests being
removed from the blacklist.
Change-Id: I5518c05bca3671c67a3462350aaf977274302cdf
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 87 insertions(+), 11 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 6b880bf..563cf18 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 = 1dd1c769fc68d6ea7a8ae12aad04e657470223d3;
+var expectedSHA1 = 4717c2ba6555452bfc0525d2551b1776ec723b47;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 278c83af8b2426d95f578e01e3bc679abf7b9d4b;
+var latestCommit = 1c4a8ff314ae894a5dae23cd1c6b76b4e82bac49;
var fs = require('fs');
var path = require('path');
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index c947ac9..ea4bd57 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -287,7 +287,6 @@
add(wt2html, Gallery with wikitext inside caption, p
data-parsoid='{\dsr\:[0,156,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:foobar.jpg|[[File:foobar.jpg|20px|desc|alt=inneralt]]|alt=galleryalt\\nFile:foobar.jpg|{{Test|unamedParam|alt=param}}|alt=galleryalt\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[0,156,9,0]}'lt;gallery\nFile:foobar.jpg|[[File:foobar.jpg|20px|desc|alt=inneralt]]|alt=galleryalt\nFile:foobar.jpg|{{Test|unamedParam|alt=param}}|alt=galleryalt\nlt;/gallery/span/p);
add(wt2html, gallery (with showfilename option), p
data-parsoid='{\dsr\:[0,149,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\ data-parsoid='{\stx\:\html\,\src\:\lt;gallery
showfilename\\nFile:Nonexistent.jpg|caption\\nFile:Nonexistent.jpg\\nimage:foobar.jpg|some
#39;#39;#39;caption#39;#39;#39; [[Main
Page]]\\nFile:Foobar.jpg\\nlt;/gallery\,\tagWidths\:[22,10],\autoInsertedEnd\:true,\dsr\:[0,149,22,0]}'lt;gallery
showfilename\nFile:Nonexistent.jpg|caption\nFile:Nonexistent.jpg\nimage:foobar.jpg|some
'''caption''' [[Main Page]]\nFile:Foobar.jpg\nlt;/gallery/span/p);
add(wt2html, Gallery (with namespace-less filenames), p
data-parsoid='{\dsr\:[0,85,0,0]}'span typeof=\mw:Extension/gallery\
about=\#mwt1\
data-parsoid='{\stx\:\html\,\src\:\lt;gallery\\nFile:Nonexistent.jpg\\nNonexistent.jpg\\nimage:foobar.jpg\\nfoobar.jpg\\nlt;/gallery\,\tagWidths\:[9,10],\autoInsertedEnd\:true,\dsr\:[0,85,9,0]}'lt;gallery\nFile:Nonexistent.jpg\nNonexistent.jpg\nimage:foobar.jpg\nfoobar.jpg\nlt;/gallery/span/p);
-add(wt2html, __FORCETOC__ override, meta
property=\mw:PageProp/newsectionlink\
data-parsoid='{\src\:\__NEWSECTIONLINK__\,\magicSrc\:\__NEWSECTIONLINK__\,\dsr\:[0,18,null,null]}'/\nmeta
property=\mw:PageProp/forcetoc\
data-parsoid='{\src\:\__FORCETOC__\,\magicSrc\:\__FORCETOC__\,\dsr\:[19,31,null,null]}'/);
add(wt2html, Centre-aligned image, figure class=\mw-default-size
mw-halign-center\ typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\center\,\ak\:\centre\}],\dsr\:[0,27,2,2]}'a
href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\sa\:{},\dsr\:[2,25,null,null]}'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\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\220\,\width\:\1941\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/figure);
add(wt2html, None-aligned image, figure class=\mw-default-size
mw-halign-none\ typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\none\,\ak\:\none\}],\dsr\:[0,25,2,2]}'a
href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\},\sa\:{},\dsr\:[2,23,null,null]}'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\
[MediaWiki-commits] [Gerrit] Sync parsertests with core. - change (mediawiki...parsoid)
Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/197636
Change subject: Sync parsertests with core.
..
Sync parsertests with core.
Change-Id: I4a675fa831763feda27c68f146379af6a429c2ae
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 134 insertions(+), 134 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/36/197636/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 51604fc..8c3e868 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 = e85b4fef8da6730096cb8eb9e44f280e8f7d0659;
+var expectedSHA1 = f6d909cfbdbf19c5b2de360f26c59919b3f3be8f;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 6b33e7fc21b4f6e03bd2e2ba4912eb49836ecbcf;
+var latestCommit = 5205405385397782b5288b429f49c9d8c97ac6c6;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 30a16d8..9db7448 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -451,11 +451,11 @@
pa
/ppbr /
/p
-h1a href=#b class=mw-headline-anchor aria-hidden=true title=Link to
this section§/aspan class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
pa href=/index.php?title=Aamp;action=editamp;redlink=1 class=new
title=A (page does not exist)a/a
/ppbr /
/p
-h1a href=#b_2 class=mw-headline-anchor aria-hidden=true title=Link
to this section§/aspan class=mw-headline id=b_2b/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=2 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=b_2b/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=2 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
!! end
@@ -468,7 +468,7 @@
[[a]]
!! html
-h1a href=#b class=mw-headline-anchor aria-hidden=true title=Link to
this section§/aspan class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
pa href=/index.php?title=Aamp;action=editamp;redlink=1 class=new
title=A (page does not exist)a/a
/p
!! end
@@ -8242,7 +8242,7 @@
!! html
ulli foo/li/ul
ulliulli bar/li/ul/li/ul
-h2a href=#A_heading class=mw-headline-anchor aria-hidden=true
title=Link to this section§/aspan class=mw-headline id=A_headingA
heading/spanspan class=mw-editsectionspan
class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: A headingedit/aspan
class=mw-editsection-bracket]/span/span/h2
+h2span class=mw-headline id=A_headingA heading/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: A headingedit/aspan
class=mw-editsection-bracket]/span/span/h2
ulli Another list item/li/ul
!!end
@@ -9984,8 +9984,8 @@
!! wikitext
{{includeonly section}}
!! html
-h2a href=#Includeonly_section class=mw-headline-anchor
aria-hidden=true title=Link to this section§/aspan class=mw-headline
id=Includeonly_sectionIncludeonly section/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Template:Includeonly_sectionamp;action=editamp;section=T-1
title=Template:Includeonly sectionedit/aspan
class=mw-editsection-bracket]/span/span/h2
-h2a href=#Section_T-1 class=mw-headline-anchor aria-hidden=true
title=Link to this section§/aspan class=mw-headline
id=Section_T-1Section T-1/spanspan class=mw-editsectionspan
class=mw-editsection-bracket[/spana
href=/index.php?title=Template:Includeonly_sectionamp;action=editamp;section=T-2
title=Template:Includeonly sectionedit/aspan
class=mw-editsection-bracket]/span/span/h2
+h2span
[MediaWiki-commits] [Gerrit] Sync parsertests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parsertests with core.
..
Sync parsertests with core.
Change-Id: I4a675fa831763feda27c68f146379af6a429c2ae
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 134 insertions(+), 134 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 51604fc..8c3e868 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 = e85b4fef8da6730096cb8eb9e44f280e8f7d0659;
+var expectedSHA1 = f6d909cfbdbf19c5b2de360f26c59919b3f3be8f;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 6b33e7fc21b4f6e03bd2e2ba4912eb49836ecbcf;
+var latestCommit = 5205405385397782b5288b429f49c9d8c97ac6c6;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 30a16d8..9db7448 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -451,11 +451,11 @@
pa
/ppbr /
/p
-h1a href=#b class=mw-headline-anchor aria-hidden=true title=Link to
this section§/aspan class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
pa href=/index.php?title=Aamp;action=editamp;redlink=1 class=new
title=A (page does not exist)a/a
/ppbr /
/p
-h1a href=#b_2 class=mw-headline-anchor aria-hidden=true title=Link
to this section§/aspan class=mw-headline id=b_2b/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=2 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=b_2b/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=2 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
!! end
@@ -468,7 +468,7 @@
[[a]]
!! html
-h1a href=#b class=mw-headline-anchor aria-hidden=true title=Link to
this section§/aspan class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
+h1span class=mw-headline id=bb/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: bedit/aspan class=mw-editsection-bracket]/span/span/h1
pa href=/index.php?title=Aamp;action=editamp;redlink=1 class=new
title=A (page does not exist)a/a
/p
!! end
@@ -8242,7 +8242,7 @@
!! html
ulli foo/li/ul
ulliulli bar/li/ul/li/ul
-h2a href=#A_heading class=mw-headline-anchor aria-hidden=true
title=Link to this section§/aspan class=mw-headline id=A_headingA
heading/spanspan class=mw-editsectionspan
class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: A headingedit/aspan
class=mw-editsection-bracket]/span/span/h2
+h2span class=mw-headline id=A_headingA heading/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Parser_testamp;action=editamp;section=1 title=Edit
section: A headingedit/aspan
class=mw-editsection-bracket]/span/span/h2
ulli Another list item/li/ul
!!end
@@ -9984,8 +9984,8 @@
!! wikitext
{{includeonly section}}
!! html
-h2a href=#Includeonly_section class=mw-headline-anchor
aria-hidden=true title=Link to this section§/aspan class=mw-headline
id=Includeonly_sectionIncludeonly section/spanspan
class=mw-editsectionspan class=mw-editsection-bracket[/spana
href=/index.php?title=Template:Includeonly_sectionamp;action=editamp;section=T-1
title=Template:Includeonly sectionedit/aspan
class=mw-editsection-bracket]/span/span/h2
-h2a href=#Section_T-1 class=mw-headline-anchor aria-hidden=true
title=Link to this section§/aspan class=mw-headline
id=Section_T-1Section T-1/spanspan class=mw-editsectionspan
class=mw-editsection-bracket[/spana
href=/index.php?title=Template:Includeonly_sectionamp;action=editamp;section=T-2
title=Template:Includeonly sectionedit/aspan
class=mw-editsection-bracket]/span/span/h2
+h2span class=mw-headline id=Includeonly_sectionIncludeonly
section/spanspan
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
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
503d692762ae79ba7aa1550c2b6261d387ce780d
Change-Id: Ic616bc7a02125994035c4947be8a1cf6c1be37c2
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Marcoil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 58ea47e..53d7cc4 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 = 1a326130c0eaccffd1086a4b44dd7869a21c91fa;
+var expectedSHA1 = 076f79047be4d64a3dfc59594b19ef1c3723d24a;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 60ad62b807d795aecd52f946eaa58a9e50cf9f2c;
+var latestCommit = 24180b99d44094a7a239bd55ee1921d2595874eb;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 1ac7668..b891676 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -2861,7 +2861,7 @@
!! html
a ul class=gallery mw-gallery-traditional
li class=gallerybox style=width: 155pxdiv style=width:
155px
- div class=thumb style=width: 150px;div
style=margin:68px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14 //a/div/div
+ div class=thumb style=width: 150px;div
style=margin:68px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
/div
/div/li
@@ -2873,7 +2873,7 @@
li class=gallerybox style=width: 155px
div style=width: 155px
div class=thumb style=width: 150px;
-div style=margin:68px auto;a href=/wiki/File:Foobar.jpg
class=imageimg alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14 //a/div
+div style=margin:68px auto;a href=/wiki/File:Foobar.jpg
class=imageimg alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x
//a/div
/div
div class=gallerytext/div
/div
@@ -16821,19 +16821,19 @@
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt= src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8 //a/div/div
+ div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt= src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/105px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/140px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
psome bcaption/b a href=/wiki/Main_Page title=Main PageMain
Page/a
/p
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8 //a/div/div
+ div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/105px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/140px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=This is a foo-bar.
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193332
Change subject: Sync parserTests with core
..
Sync parserTests with core
* This matches upstream core commit
503d692762ae79ba7aa1550c2b6261d387ce780d
Change-Id: Ic616bc7a02125994035c4947be8a1cf6c1be37c2
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 20 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/32/193332/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 58ea47e..53d7cc4 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 = 1a326130c0eaccffd1086a4b44dd7869a21c91fa;
+var expectedSHA1 = 076f79047be4d64a3dfc59594b19ef1c3723d24a;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 60ad62b807d795aecd52f946eaa58a9e50cf9f2c;
+var latestCommit = 24180b99d44094a7a239bd55ee1921d2595874eb;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 1ac7668..b891676 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -2861,7 +2861,7 @@
!! html
a ul class=gallery mw-gallery-traditional
li class=gallerybox style=width: 155pxdiv style=width:
155px
- div class=thumb style=width: 150px;div
style=margin:68px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14 //a/div/div
+ div class=thumb style=width: 150px;div
style=margin:68px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
/div
/div/li
@@ -2873,7 +2873,7 @@
li class=gallerybox style=width: 155px
div style=width: 155px
div class=thumb style=width: 150px;
-div style=margin:68px auto;a href=/wiki/File:Foobar.jpg
class=imageimg alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14 //a/div
+div style=margin:68px auto;a href=/wiki/File:Foobar.jpg
class=imageimg alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/120px-Foobar.jpg;
width=120 height=14
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/240px-Foobar.jpg 2x
//a/div
/div
div class=gallerytext/div
/div
@@ -16821,19 +16821,19 @@
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt= src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8 //a/div/div
+ div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt= src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/105px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/140px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
psome bcaption/b a href=/wiki/Main_Page title=Main PageMain
Page/a
/p
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8 //a/div/div
+ div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
alt=Foobar.jpg
src=http://example.com/images/thumb/3/3a/Foobar.jpg/70px-Foobar.jpg;
width=70 height=8
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/105px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/140px-Foobar.jpg 2x
//a/div/div
div class=gallerytext
/div
/div/li
li class=gallerybox style=width: 105pxdiv style=width:
105px
- div class=thumb style=width: 100px;div
style=margin:31px auto;a href=/wiki/File:Foobar.jpg class=imageimg
[MediaWiki-commits] [Gerrit] Sync parserTests with core - change (mediawiki...parsoid)
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 60ad62b807d795aecd52f946eaa58a9e50cf9f2c * A whole lot of noise is introduced by I562e437ec0bd337c9db0406f5dcab504dfa37034 where section headers now generate an anchor. Here we strip those anchors when normalizing html to avoid any artificial failures. We do likewise for wt-headline spans. The rest of the busy changes are tests starting at html that probably should have the input itself normalized or it'll never match. * There's also a new tests from Id0a55aa4c1917bac2f8f0d4863fcb85bd3dff1ca that we don't pass. Change-Id: I75dad9995e173d0bd9ef106ac6574d1e3ef42fbc --- M lib/mediawiki.DOMUtils.js M tests/fetch-parserTests.txt.js M tests/parserTests-blacklist.js M tests/parserTests.js M tests/parserTests.txt 5 files changed, 277 insertions(+), 227 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/191816 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75dad9995e173d0bd9ef106ac6574d1e3ef42fbc Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org 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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review. https://gerrit.wikimedia.org/r/155735 Change subject: Sync parserTests with core. .. Sync parserTests with core. This matches upstream core commit 13a85541fccca12ead97c0bb393b505c201f4f59. Upstream added tidy support to parser tests, in commit 019e8ce29d5e94597bf7f50a2bc6ba8614e2bbe9. Parsoid had this support added in commit 7a6df104bf41107c1b9d3e1291319f35e3fbcd06. The commit adds the following new failures to the blacklist: * Legit P-wrapping bugs: - Block tag on one line (div) (wt2html) - Block tag on one line (blockquote) (wt2html) - Block tag on both lines (div) (wt2html) - Block tag on both lines (blockquote) (wt2html) - Multiple lines without block tags (wt2html) - Empty lines between lines with block tags (wt2html) - Empty lines between lines with block tags (html2html) (This might be a subtly different bug, but the p-wrapping should be fixed first) - Bug 15491: ins/del in blockquote (2) (wt2html) - Bug 15491: ins/del in blockquote (2) (html2wt) (The above two are quirks in tidy; we may want to add a html/parsoid case for parsoid behavior... once we've fixed p-wrapping in general.) - 3a. Indent-Pre and block tags (single-line html) (wt2html) - 3b. Indent-Pre and block tags (multi-line html) (wt2html) - Horizontal ruler -- Supports content following dashes on same line (wt2html) - Horizontal ruler -- Supports content following dashes on same line (html2wt) (In the html2wt direction we don't recognize the potential implicit p-wrapping.) - Templates: 2. Inside a block tag (wt2html) - Templates: P-wrapping: 1c. Templates on consecutive lines (wt2html) - Fuzz testing: URL adjacent extension (no space, dirty; pre) (wt2html) - Bug 6200: paragraphs inside blockquotes (no extra line breaks) (wt2html) - Bug 6200: paragraphs inside blockquotes (extra line break on close) (wt2html) * Related to p-wrapping, except in the inverse direction: we emit wt that *won't* get p-wrapped (but it needs to be): - Bug 6200: paragraphs inside blockquotes (extra line break on open) (html2wt) * We don't strip empty pre tags, but tidy does: - Empty pre; pre inside other HTML tags (bug 54946) (wt2html) * Expected fail, because the input is broken markup: (We should probably fix the test cases to exclude wt2wt) - Implicit td after a |- (wt2wt) - pre tags should be recognized in an explicit td context, but not in an implicit td context (wt2wt) * Not yet sure what's going on here, I think our generated wt wouldn't round trip: - Lists should be recognized in an implicit td context (wt2wt) * I think upstream/core added some new Local interwiki link support which Parsoid doesn't yet know about (maybe bug 61357,64167 is related): - Local interwiki link (wt2html) - Local interwiki link (html2wt) - Local interwiki link (html2html) - Local interwiki link: self-link to current page (wt2html) - Local interwiki link: self-link to current page (html2wt) - Local interwiki link: prefix only (bug 64167) (wt2html) - Local interwiki link: prefix only (bug 64167) (html2wt) - Local interwiki link: prefix only (bug 64167) (html2html) - Local interwiki link: with additional interwiki prefix (bug 61357) (wt2html) - Local interwiki link: with additional interwiki prefix (bug 61357) (html2wt) - Local interwiki link: with additional interwiki prefix (bug 61357) (html2html) - Interlanguage link with preceding local interwiki link (bug 68085) (wt2html) - Interlanguage link with preceding local interwiki link (bug 68085) (html2wt) - Interlanguage link with preceding local interwiki link (bug 68085) (html2html) - Looks like an interlanguage link, but is actually a local interwiki (wt2html) - Looks like an interlanguage link, but is actually a local interwiki (html2wt) - Looks like an interlanguage link, but is actually a local interwiki (html2html) * Expected fail, we don't preserve crazy spacing in html2wt: - Interlanguage link with spacing (html2wt) * We emit li tags unwrapped by ul: - Multiple list tags generated by templates (wt2html) * Looks correct, we should fix the test case: - Test the li-hack (The PHP parser relies on Tidy for the hack) (wt2html) - Test the li-hack (The PHP parser relies on Tidy for the hack) (wt2wt) (the wt2wt case is maybe bogus) * Need to look at this one: - Unbalanced closing block tags break a list (php parser relies on Tidy to fix up) (html2wt) * Parsoid fails this test, but it might be tricky to support properly. See bug 68395.: - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (wt2html) - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (wt2wt) - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (html2wt) -
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 13a85541fccca12ead97c0bb393b505c201f4f59. Upstream added tidy support to parser tests, in commit 019e8ce29d5e94597bf7f50a2bc6ba8614e2bbe9. Parsoid had this support added in commit 7a6df104bf41107c1b9d3e1291319f35e3fbcd06. This exposed new bugs where Parsoid's output doesn't actually match the output of the PHP parser + tidy. The commit adds the following new failures to the blacklist: * Legit P-wrapping bugs (bug 64901): - Block tag on one line (div) (wt2html) - Block tag on one line (blockquote) (wt2html) - Block tag on both lines (div) (wt2html) - Block tag on both lines (blockquote) (wt2html) - Multiple lines without block tags (wt2html) - Empty lines between lines with block tags (wt2html) - Empty lines between lines with block tags (html2html) (This might be a subtly different bug, but the p-wrapping should be fixed first) - Bug 15491: ins/del in blockquote (2) (wt2html) - Bug 15491: ins/del in blockquote (2) (html2wt) (The above two are quirks in tidy; we may want to add a html/parsoid case for parsoid behavior... once we've fixed p-wrapping in general.) - 3a. Indent-Pre and block tags (single-line html) (wt2html) - 3b. Indent-Pre and block tags (multi-line html) (wt2html) - Horizontal ruler -- Supports content following dashes on same line (wt2html) - Horizontal ruler -- Supports content following dashes on same line (html2wt) (In the html2wt direction we don't recognize the potential implicit p-wrapping.) - Templates: 2. Inside a block tag (wt2html) - Templates: P-wrapping: 1c. Templates on consecutive lines (wt2html) - Fuzz testing: URL adjacent extension (no space, dirty; pre) (wt2html) - Bug 6200: paragraphs inside blockquotes (no extra line breaks) (wt2html) - Bug 6200: paragraphs inside blockquotes (extra line break on close) (wt2html) * Related to p-wrapping, except in the inverse direction: we emit wt that *won't* get p-wrapped (but it needs to be): - Bug 6200: paragraphs inside blockquotes (extra line break on open) (html2wt) * Core added some new Local interwiki link tests which Parsoid doesn't yet pass (bug 69909): - Local interwiki link (wt2html) - Local interwiki link (html2wt) - Local interwiki link (html2html) - Local interwiki link: self-link to current page (wt2html) - Local interwiki link: self-link to current page (html2wt) - Local interwiki link: prefix only (bug 64167) (wt2html) - Local interwiki link: prefix only (bug 64167) (html2wt) - Local interwiki link: prefix only (bug 64167) (html2html) - Local interwiki link: with additional interwiki prefix (bug 61357) (wt2html) - Local interwiki link: with additional interwiki prefix (bug 61357) (html2wt) - Local interwiki link: with additional interwiki prefix (bug 61357) (html2html) - Interlanguage link with preceding local interwiki link (bug 68085) (wt2html) - Interlanguage link with preceding local interwiki link (bug 68085) (html2wt) - Interlanguage link with preceding local interwiki link (bug 68085) (html2html) - Looks like an interlanguage link, but is actually a local interwiki (wt2html) - Looks like an interlanguage link, but is actually a local interwiki (html2wt) - Looks like an interlanguage link, but is actually a local interwiki (html2html) * We emit li tags unwrapped by ul: - Multiple list tags generated by templates (wt2html) * Our li-hack implementation never actually agreed with PHP+Tidy: (See https://gerrit.wikimedia.org/r/155348) - Test the li-hack (The PHP parser relies on Tidy for the hack) (wt2html) - Test the li-hack (The PHP parser relies on Tidy for the hack) (wt2wt) * We generate excessive whitespace in WTS, but doesn't break round-trip: - Unbalanced closing block tags break a list (php parser relies on Tidy to fix up) (html2wt) * Parsoid fails this test, but it might be tricky to support properly. See bug 68395: - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (wt2html) - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (wt2wt) - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (html2wt) - Unbalanced closing non-block tags don't break a list (php parser relies on Tidy to fix up) (html2html) - List embedded in a non-block tag (Ugly Parsoid output -- worth fixing; PHP parser relies on Tidy) (wt2html) - List embedded in a non-block tag (Ugly Parsoid output -- worth fixing; PHP parser relies on Tidy) (html2wt) - List embedded in a non-block tag (Ugly Parsoid output -- worth fixing; PHP parser relies on Tidy) (html2html) Bug: 64901 Bug: 68395 Bug: 69909 Change-Id:
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 fb22c45886c6b63062dd45101a208294888e7ba9.
Jackmcbarn's patch https://gerrit.wikimedia.org/r/136234 to Support
{{!}} as a magic word seems to cause the tests Parsoid: Merge double
tds (bug 50603) and Parsoid: Merge double tds in nested transclusion
content (bug 50603) to fail, since Template:! is no longer defined in
parserTests.txt.
This is not an issue outside parserTests since Template:{{!}} continues
to exist on the wikis where it is used.
Change-Id: I9a92b70edc959e3f223de51ca7b3e215797f7318
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 7 insertions(+), 9 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index ceaeb83..fb2cf21 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 7bce9a83bbd36b23758ddcd5847ad2df2bf2ff0b;
+var expectedSHA1 = 1a8c7adf51a2b0386db250d6d9d35003790e195e;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 9b8c1fe24a120d679449dd80819c982968b8d446;
+var latestCommit = fb22c45886c6b63062dd45101a208294888e7ba9;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 7a74e5e..0332d34 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -130,6 +130,8 @@
add(wt2html, Bug 6563: Edit link generation for section suppressed by
includeonly, meta typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\\n==Includeonly
section==\\nlt;/includeonly\,\dsr\:[0,52,null,null]}'/meta
typeof=\mw:Includes/IncludeOnly/End\
data-parsoid='{\src\:\\,\dsr\:[52,52,null,null]}'/\nh2
data-parsoid='{\dsr\:[53,66,2,2]}'Section 1/h2);
add(wt2html, Bug 6563: Section extraction for section suppressed by
includeonly, meta typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\\n==Includeonly
section==\\nlt;/includeonly\,\dsr\:[0,52,null,null]}'/meta
typeof=\mw:Includes/IncludeOnly/End\
data-parsoid='{\src\:\\,\dsr\:[52,52,null,null]}'/\nh2
data-parsoid='{\dsr\:[53,66,2,2]}'Section 1/h2);
add(wt2html, Un-closed includeonly, meta
typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\,\dsr\:[0,13,null,null]}'/);
+add(wt2html, Parsoid: Merge double tds (bug 50603), table
data-parsoid='{\dsr\:[0,25,2,2]}'\ntbody
data-parsoid='{\dsr\:[3,23,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[3,22,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[3,22,1,0]}'span
typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt1\ id=\mwt2\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\{{!}}
foo\}},\i\:0}}]}'
data-parsoid='{\dsr\:[4,22,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'Warning:
Page/template fetching disabled, and no cache for Template:!/spanmeta
typeof=\mw:Transclusion/End\ about=\#mwt1\ data-parsoid=\{}\/span
about=\#mwt1\ data-parsoid=\{}\ foo/span/td/tr\n/tbody/table);
+add(wt2html, Parsoid: Merge double tds in nested transclusion content (bug
50603), div about=\#mwt1\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\lt;div\}},\i\:0}},\\\n{|\\n|\,{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\{{!}}
foo\}},\i\:1}},\\\n|}\\n\,{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\lt;/div\}},\i\:2}}]}'
data-parsoid='{\stx\:\html\,\dsr\:[0,56,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}],[{\k\:\1\,\spc\:[\\,\\,\\,\\]}],[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'\ntable
data-parsoid='{\dsr\:[15,40,2,2]}'\ntbody
data-parsoid='{\dsr\:[18,38,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[18,37,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[18,37,1,0]}'span
typeof=\mw:Placeholder\ about=\#mwt3\ id=\mwt3\
data-parsoid='{\dsr\:[19,37,null,null],\src\:\{{echo|{{!}}
foo}}\}'Warning: Page/template fetching disabled, and no cache for
Template:!/spanmeta typeof=\mw:Transclusion/End\ about=\#mwt3\
data-parsoid=\{}\/ foo/td/tr\n/tbody/table\n/div);
add(wt2html, 2. includeonly in html attr value, p
data-parsoid='{\dsr\:[0,155,0,0]}'span id=\v1\ about=\#mwt1\
typeof=\mw:ExpandedAttrs\
data-mw='{\attribs\:[[{\txt\:\id\},{\html\:\lt;meta
typeof=\\\mw:Includes/NoInclude\\\
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/145395
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit fb22c45886c6b63062dd45101a208294888e7ba9.
Jackmcbarn's patch https://gerrit.wikimedia.org/r/136234 to Support
{{!}} as a magic word seems to cause the tests Parsoid: Merge double
tds (bug 50603) and Parsoid: Merge double tds in nested transclusion
content (bug 50603) to fail, since Template:! is no longer defined in
parserTests.txt.
Change-Id: I9a92b70edc959e3f223de51ca7b3e215797f7318
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/95/145395/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index ceaeb83..fb2cf21 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 7bce9a83bbd36b23758ddcd5847ad2df2bf2ff0b;
+var expectedSHA1 = 1a8c7adf51a2b0386db250d6d9d35003790e195e;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 9b8c1fe24a120d679449dd80819c982968b8d446;
+var latestCommit = fb22c45886c6b63062dd45101a208294888e7ba9;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 7a74e5e..0332d34 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -130,6 +130,8 @@
add(wt2html, Bug 6563: Edit link generation for section suppressed by
includeonly, meta typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\\n==Includeonly
section==\\nlt;/includeonly\,\dsr\:[0,52,null,null]}'/meta
typeof=\mw:Includes/IncludeOnly/End\
data-parsoid='{\src\:\\,\dsr\:[52,52,null,null]}'/\nh2
data-parsoid='{\dsr\:[53,66,2,2]}'Section 1/h2);
add(wt2html, Bug 6563: Section extraction for section suppressed by
includeonly, meta typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\\n==Includeonly
section==\\nlt;/includeonly\,\dsr\:[0,52,null,null]}'/meta
typeof=\mw:Includes/IncludeOnly/End\
data-parsoid='{\src\:\\,\dsr\:[52,52,null,null]}'/\nh2
data-parsoid='{\dsr\:[53,66,2,2]}'Section 1/h2);
add(wt2html, Un-closed includeonly, meta
typeof=\mw:Includes/IncludeOnly\
data-parsoid='{\src\:\lt;includeonly\,\dsr\:[0,13,null,null]}'/);
+add(wt2html, Parsoid: Merge double tds (bug 50603), table
data-parsoid='{\dsr\:[0,25,2,2]}'\ntbody
data-parsoid='{\dsr\:[3,23,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[3,22,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[3,22,1,0]}'span
typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt1\ id=\mwt2\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\{{!}}
foo\}},\i\:0}}]}'
data-parsoid='{\dsr\:[4,22,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'Warning:
Page/template fetching disabled, and no cache for Template:!/spanmeta
typeof=\mw:Transclusion/End\ about=\#mwt1\ data-parsoid=\{}\/span
about=\#mwt1\ data-parsoid=\{}\ foo/span/td/tr\n/tbody/table);
+add(wt2html, Parsoid: Merge double tds in nested transclusion content (bug
50603), div about=\#mwt1\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\lt;div\}},\i\:0}},\\\n{|\\n|\,{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\{{!}}
foo\}},\i\:1}},\\\n|}\\n\,{\template\:{\target\:{\wt\:\echo\,\href\:\./Template:Echo\},\params\:{\1\:{\wt\:\lt;/div\}},\i\:2}}]}'
data-parsoid='{\stx\:\html\,\dsr\:[0,56,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}],[{\k\:\1\,\spc\:[\\,\\,\\,\\]}],[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'\ntable
data-parsoid='{\dsr\:[15,40,2,2]}'\ntbody
data-parsoid='{\dsr\:[18,38,0,0]}'tr
data-parsoid='{\autoInsertedEnd\:true,\autoInsertedStart\:true,\dsr\:[18,37,0,0]}'td
data-parsoid='{\autoInsertedEnd\:true,\dsr\:[18,37,1,0]}'span
typeof=\mw:Placeholder\ about=\#mwt3\ id=\mwt3\
data-parsoid='{\dsr\:[19,37,null,null],\src\:\{{echo|{{!}}
foo}}\}'Warning: Page/template fetching disabled, and no cache for
Template:!/spanmeta typeof=\mw:Transclusion/End\ about=\#mwt3\
data-parsoid=\{}\/ foo/td/tr\n/tbody/table\n/div);
add(wt2html, 2. includeonly in html attr value, p
data-parsoid='{\dsr\:[0,155,0,0]}'span id=\v1\ about=\#mwt1\
typeof=\mw:ExpandedAttrs\
data-mw='{\attribs\:[[{\txt\:\id\},{\html\:\lt;meta
typeof=\\\mw:Includes/NoInclude\\\
data-parsoid=\\\{amp;quot;srcamp;quot;:amp;quot;lt;noincludeamp;quot;,amp;quot;dsramp;quot;:[10,21,null,null]}\\\v1lt;meta
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141752
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream core commit 480546006c1486edf763f600242868787a6af1da.
Upstream added a new gallery test, which parsoid doesn't support yet.
It also un-disabled the test for the {{msgnw}} keyword.
Change-Id: Iea0ad91d9f3c12de0ab35f50616b109ce05a41f7
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 47 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/52/141752/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 0dc62f9..ceaeb83 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 06efe4a9a7f5f6846e7c3127eaf0ce76dcf4f37c;
+var expectedSHA1 = 7bce9a83bbd36b23758ddcd5847ad2df2bf2ff0b;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = d4bc99e7eda74bd6e820195a6fe886dc0f391719;
+var latestCommit = 9b8c1fe24a120d679449dd80819c982968b8d446;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 8cd7ac3..cb7ba4e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -327,6 +327,7 @@
add(wt2html, Say the magic word, ul
data-parsoid='{\dsr\:[0,544,0,0]}'li data-parsoid='{\dsr\:[0,14,1,0]}'
span about=\#mwt1\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\PAGENAME\,\function\:\pagename\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[2,14,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[15,30,1,0]}' span
about=\#mwt2\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\PAGENAMEE\,\function\:\pagenamee\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[17,30,null,null],\pi\:[[]]}'/span/li\nli
data-parsoid='{\dsr\:[31,49,1,0]}' span about=\#mwt3\
typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\FULLPAGENAME\,\function\:\fullpagename\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[33,49,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[50,69,1,0]}' span
about=\#mwt4\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\FULLPAGENAMEE\,\function\:\fullpagenamee\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[52,69,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[70,88,1,0]}' span
typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt5\ id=\mwt5\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\BASEPAGENAME\,\href\:\./Template:BASEPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[72,88,null,null],\pi\:[[]]}'Warning: Page/template
fetching disabled, and no cache for Template:BASEPAGENAME/span/li\nli
data-parsoid='{\dsr\:[89,108,1,0]}' span typeof=\mw:Transclusion
mw:Placeholder\ about=\#mwt6\ id=\mwt6\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\BASEPAGENAMEE\,\href\:\./Template:BASEPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[91,108,null,null],\pi\:[[]]}'Warning: Page/template
fetching disabled, and no cache for Template:BASEPAGENAMEE/span/li\nli
data-parsoid='{\dsr\:[109,126,1,0]}' span typeof=\mw:Transclusion
mw:Placeholder\ about=\#mwt7\ id=\mwt7\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\SUBPAGENAME\,\href\:\./Template:SUBPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[111,126,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:SUBPAGENAME/span/li\nli data-parsoid='{\dsr\:[127,145,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt8\ id=\mwt8\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\SUBPAGENAMEE\,\href\:\./Template:SUBPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[129,145,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:SUBPAGENAMEE/span/li\nli data-parsoid='{\dsr\:[146,164,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt9\ id=\mwt9\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\ROOTPAGENAME\,\href\:\./Template:ROOTPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[148,164,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:ROOTPAGENAME/span/li\nli data-parsoid='{\dsr\:[165,184,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt10\ id=\mwt10\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\ROOTPAGENAMEE\,\href\:\./Template:ROOTPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[167,184,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
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 480546006c1486edf763f600242868787a6af1da.
Upstream added a new gallery test, which parsoid doesn't support yet.
It also un-disabled the test for the {{msgnw}} keyword.
Change-Id: Iea0ad91d9f3c12de0ab35f50616b109ce05a41f7
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 47 insertions(+), 9 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 0dc62f9..ceaeb83 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 06efe4a9a7f5f6846e7c3127eaf0ce76dcf4f37c;
+var expectedSHA1 = 7bce9a83bbd36b23758ddcd5847ad2df2bf2ff0b;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = d4bc99e7eda74bd6e820195a6fe886dc0f391719;
+var latestCommit = 9b8c1fe24a120d679449dd80819c982968b8d446;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 8cd7ac3..cb7ba4e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -327,6 +327,7 @@
add(wt2html, Say the magic word, ul
data-parsoid='{\dsr\:[0,544,0,0]}'li data-parsoid='{\dsr\:[0,14,1,0]}'
span about=\#mwt1\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\PAGENAME\,\function\:\pagename\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[2,14,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[15,30,1,0]}' span
about=\#mwt2\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\PAGENAMEE\,\function\:\pagenamee\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[17,30,null,null],\pi\:[[]]}'/span/li\nli
data-parsoid='{\dsr\:[31,49,1,0]}' span about=\#mwt3\
typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\FULLPAGENAME\,\function\:\fullpagename\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[33,49,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[50,69,1,0]}' span
about=\#mwt4\ typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\FULLPAGENAMEE\,\function\:\fullpagenamee\},\params\:{},\i\:0}}]}'
data-parsoid='{\pi\:[[]],\dsr\:[52,69,null,null]}'Parser
test/span/li\nli data-parsoid='{\dsr\:[70,88,1,0]}' span
typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt5\ id=\mwt5\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\BASEPAGENAME\,\href\:\./Template:BASEPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[72,88,null,null],\pi\:[[]]}'Warning: Page/template
fetching disabled, and no cache for Template:BASEPAGENAME/span/li\nli
data-parsoid='{\dsr\:[89,108,1,0]}' span typeof=\mw:Transclusion
mw:Placeholder\ about=\#mwt6\ id=\mwt6\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\BASEPAGENAMEE\,\href\:\./Template:BASEPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[91,108,null,null],\pi\:[[]]}'Warning: Page/template
fetching disabled, and no cache for Template:BASEPAGENAMEE/span/li\nli
data-parsoid='{\dsr\:[109,126,1,0]}' span typeof=\mw:Transclusion
mw:Placeholder\ about=\#mwt7\ id=\mwt7\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\SUBPAGENAME\,\href\:\./Template:SUBPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[111,126,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:SUBPAGENAME/span/li\nli data-parsoid='{\dsr\:[127,145,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt8\ id=\mwt8\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\SUBPAGENAMEE\,\href\:\./Template:SUBPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[129,145,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:SUBPAGENAMEE/span/li\nli data-parsoid='{\dsr\:[146,164,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt9\ id=\mwt9\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\ROOTPAGENAME\,\href\:\./Template:ROOTPAGENAME\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[148,164,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:ROOTPAGENAME/span/li\nli data-parsoid='{\dsr\:[165,184,1,0]}'
span typeof=\mw:Transclusion mw:Placeholder\ about=\#mwt10\ id=\mwt10\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\ROOTPAGENAMEE\,\href\:\./Template:ROOTPAGENAMEE\},\params\:{},\i\:0}}]}'
data-parsoid='{\dsr\:[167,184,null,null],\pi\:[[]]}'Warning:
Page/template fetching disabled, and no cache for
Template:ROOTPAGENAMEE/span/li\nli
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/138457
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit d4bc99e7eda74bd6e820195a6fe886dc0f391719.
This also updates the instructions in sync-parserTests.js.
Change-Id: Ibdc79f767bff274afb36928cb0d47b3fab456ba5
---
M tests/fetch-parserTests.txt.js
M tests/sync-parserTests.js
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/57/138457/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 71d8fe6..0dc62f9 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 6d7ac0271c85d5ed56fad29f2e2f73576e392186;
+var expectedSHA1 = 06efe4a9a7f5f6846e7c3127eaf0ce76dcf4f37c;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 93405c852cb0a731d31b711c50f527c6aff52664;
+var latestCommit = d4bc99e7eda74bd6e820195a6fe886dc0f391719;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/sync-parserTests.js b/tests/sync-parserTests.js
index 4d933ad..57f0634 100755
--- a/tests/sync-parserTests.js
+++ b/tests/sync-parserTests.js
@@ -23,7 +23,9 @@
$ cd $PARSOID
$ tests/fetch-parserTests.txt.js --force
- $ git commit -m Sync parserTests tests/fetch-parserTests.txt.js
+ $ tests/parserTests.js --rewrite-blacklist
+ $ git add -u
+ $ git commit -m Sync parserTests with core
$ git review
Simple, right?
--
To view, visit https://gerrit.wikimedia.org/r/138457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdc79f767bff274afb36928cb0d47b3fab456ba5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit d4bc99e7eda74bd6e820195a6fe886dc0f391719.
This also updates the instructions in sync-parserTests.js.
Change-Id: Ibdc79f767bff274afb36928cb0d47b3fab456ba5
---
M tests/fetch-parserTests.txt.js
M tests/sync-parserTests.js
2 files changed, 5 insertions(+), 3 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 71d8fe6..0dc62f9 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 6d7ac0271c85d5ed56fad29f2e2f73576e392186;
+var expectedSHA1 = 06efe4a9a7f5f6846e7c3127eaf0ce76dcf4f37c;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 93405c852cb0a731d31b711c50f527c6aff52664;
+var latestCommit = d4bc99e7eda74bd6e820195a6fe886dc0f391719;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/sync-parserTests.js b/tests/sync-parserTests.js
index 4d933ad..57f0634 100755
--- a/tests/sync-parserTests.js
+++ b/tests/sync-parserTests.js
@@ -23,7 +23,9 @@
$ cd $PARSOID
$ tests/fetch-parserTests.txt.js --force
- $ git commit -m Sync parserTests tests/fetch-parserTests.txt.js
+ $ tests/parserTests.js --rewrite-blacklist
+ $ git add -u
+ $ git commit -m Sync parserTests with core
$ git review
Simple, right?
--
To view, visit https://gerrit.wikimedia.org/r/138457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdc79f767bff274afb36928cb0d47b3fab456ba5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Arlolra abrea...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 60e9e8513de472f912e3e76434ba2aa9265fd87f.
Upstream has added a new djvu test case. Added this to the mock API, but
we don't have any support for djvu or the 'page' image parameter yet, so
the newly-added tests go on the blacklist.
Change-Id: Ia2a278bc9a5a37af64807079f9b512a9c22ebfba
---
M tests/fetch-parserTests.txt.js
M tests/mockAPI.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 65 insertions(+), 4 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index b30fba4..793d177 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 13ae5bc490f84a773c9b665d4c1f13f3439d9c3c;
+var expectedSHA1 = bbfb38bdabde9205448a3a122748892931c9931f;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 85d4e39ff096d05386fd2f333cd6acea66ad6f90;
+var latestCommit = 171f557f8de2e794f929741a0126a2515e9fe8cc;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/mockAPI.js b/tests/mockAPI.js
index 6029f9b..eeab255 100644
--- a/tests/mockAPI.js
+++ b/tests/mockAPI.js
@@ -19,6 +19,9 @@
},
'Foobar.svg': {
size: 12345, width: 240, height: 180, bits: 24, mime:
'image/svg+xml'
+ },
+ 'LoremIpsum.djvu': {
+ size: 3249, width: 2480, height: 3508, bits: 8, mime:
'image/vnd.djvu'
}
};
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 73861f0..714aefb 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -337,6 +337,7 @@
add(wt2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,26,0,0]}'span typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px\}],\dsr\:[0,26,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with following whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px
\}],\dsr\:[0,27,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with preceding whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\ data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\
640px\}],\dsr\:[0,27,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
+add(wt2html, Image with page parameter, meta typeof=\mw:Placeholder\
data-parsoid='{\src\:\[[File:LoremIpsum.djvu|page=2]]\,\optList\:[{\ck\:\page\,\ak\:\page=2\}],\dsr\:[0,31,null,null]}'/);
add(wt2html, HTML with raw HTML ($wgRawHtml==true), p
data-parsoid='{\dsr\:[0,39,0,0]}'lt;htmllt;scriptalert(1);lt;/scriptlt;/html/p);
add(wt2html, Parents of subpages, one level up, not named, p
data-parsoid='{\dsr\:[0,7,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2\},\sa\:{\href\:\../\},\dsr\:[0,7,2,2]}'Subpage_test/L1/L2/a/p);
add(wt2html, Parents of subpages, two levels up, without trailing slash or
name., p data-parsoid='{\dsr\:[0,9,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2/..\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2/..\},\sa\:{\href\:\../..\},\dsr\:[0,9,2,2]}'Subpage_test/L1/L2/../a/p);
@@ -951,6 +952,7 @@
add(html2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,64,0,0]}'img
src=\http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\;
alt=\640px-Foobar.jpg\ rel=\mw:externalImage\
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/136784
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 60e9e8513de472f912e3e76434ba2aa9265fd87f.
Upstream has added a new djvu test case. Added this to the mock API, but
we don't have any support for djvu or the 'page' image parameter yet, so
the newly-added tests go on the blacklist.
Change-Id: Ia2a278bc9a5a37af64807079f9b512a9c22ebfba
---
M tests/fetch-parserTests.txt.js
M tests/mockAPI.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 65 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/84/136784/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index b30fba4..793d177 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 13ae5bc490f84a773c9b665d4c1f13f3439d9c3c;
+var expectedSHA1 = bbfb38bdabde9205448a3a122748892931c9931f;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 85d4e39ff096d05386fd2f333cd6acea66ad6f90;
+var latestCommit = 171f557f8de2e794f929741a0126a2515e9fe8cc;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/mockAPI.js b/tests/mockAPI.js
index 6029f9b..eeab255 100644
--- a/tests/mockAPI.js
+++ b/tests/mockAPI.js
@@ -19,6 +19,9 @@
},
'Foobar.svg': {
size: 12345, width: 240, height: 180, bits: 24, mime:
'image/svg+xml'
+ },
+ 'LoremIpsum.djvu': {
+ size: 3249, width: 2480, height: 3508, bits: 8, mime:
'image/vnd.djvu'
}
};
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 0a26b5f..714aefb 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -337,6 +337,7 @@
add(wt2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,26,0,0]}'span typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px\}],\dsr\:[0,26,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with following whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px
\}],\dsr\:[0,27,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with preceding whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\ data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\
640px\}],\dsr\:[0,27,null,null]}'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/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
+add(wt2html, Image with page parameter, meta typeof=\mw:Placeholder\
data-parsoid='{\src\:\[[File:LoremIpsum.djvu|page=2]]\,\optList\:[{\ck\:\page\,\ak\:\page=2\}],\dsr\:[0,31,null,null]}'/);
add(wt2html, HTML with raw HTML ($wgRawHtml==true), p
data-parsoid='{\dsr\:[0,39,0,0]}'lt;htmllt;scriptalert(1);lt;/scriptlt;/html/p);
add(wt2html, Parents of subpages, one level up, not named, p
data-parsoid='{\dsr\:[0,7,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2\},\sa\:{\href\:\../\},\dsr\:[0,7,2,2]}'Subpage_test/L1/L2/a/p);
add(wt2html, Parents of subpages, two levels up, without trailing slash or
name., p data-parsoid='{\dsr\:[0,9,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2/..\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2/..\},\sa\:{\href\:\../..\},\dsr\:[0,9,2,2]}'Subpage_test/L1/L2/../a/p);
@@ -951,6 +952,7 @@
add(html2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,64,0,0]}'img
src=\http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\;
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130497
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 2d26a0c535191d5261e5b379230c89ad3b988935.
Upstream has added a new djvu test case. Added this to the mock API, but
we don't have any support for djvu or the 'page' image parameter yet, so
the newly-added tests go on the blacklist.
Change-Id: Ia20949bc3aed9333fdcbefc4b279d85eb75e6d77
---
M tests/fetch-parserTests.txt.js
M tests/mockAPI.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
4 files changed, 21 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/97/130497/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index b30fba4..5d2ebc9 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 13ae5bc490f84a773c9b665d4c1f13f3439d9c3c;
+var expectedSHA1 = 188581e1332aec0922e232c0c1c868a80c6badce;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 85d4e39ff096d05386fd2f333cd6acea66ad6f90;
+var latestCommit = 2d26a0c535191d5261e5b379230c89ad3b988935;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/mockAPI.js b/tests/mockAPI.js
index 6029f9b..eeab255 100644
--- a/tests/mockAPI.js
+++ b/tests/mockAPI.js
@@ -19,6 +19,9 @@
},
'Foobar.svg': {
size: 12345, width: 240, height: 180, bits: 24, mime:
'image/svg+xml'
+ },
+ 'LoremIpsum.djvu': {
+ size: 3249, width: 2480, height: 3508, bits: 8, mime:
'image/vnd.djvu'
}
};
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 5e59354..3dc69bf 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -339,6 +339,7 @@
add(wt2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,26,0,0]}'span typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px\}],\dsr\:[0,26,null,null]}'a
href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\}}'img
resource=\./File:Foobar.jpg\
src=\//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with following whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\
data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\640px
\}],\dsr\:[0,27,null,null]}'a href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\}}'img
resource=\./File:Foobar.jpg\
src=\//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
add(wt2html, Width-sized image (using px, with preceding whitespace - test
regression from r39467), p data-parsoid='{\dsr\:[0,27,0,0]}'span
typeof=\mw:Image\ data-parsoid='{\optList\:[{\ck\:\width\,\ak\:\
640px\}],\dsr\:[0,27,null,null]}'a href=\./File:Foobar.jpg\
data-parsoid='{\a\:{\href\:\./File:Foobar.jpg\}}'img
resource=\./File:Foobar.jpg\
src=\//example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\
height=\73\ width=\640\
data-parsoid='{\a\:{\resource\:\./File:Foobar.jpg\,\height\:\73\,\width\:\640\},\sa\:{\resource\:\Image:foobar.jpg\}}'//a/span/p);
+add(wt2html, Image with page parameter, meta typeof=\mw:Placeholder\
data-parsoid='{\src\:\[[File:LoremIpsum.djvu|page=2]]\,\optList\:[{\ck\:\page\,\ak\:\page=2\}],\dsr\:[0,31,null,null]}'/);
add(wt2html, HTML with raw HTML ($wgRawHtml==true), p
data-parsoid='{\dsr\:[0,39,0,0]}'lt;htmllt;scriptalert(1);lt;/scriptlt;/html/p);
add(wt2html, Parents of subpages, one level up, not named, p
data-parsoid='{\dsr\:[0,7,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2\},\sa\:{\href\:\../\},\dsr\:[0,7,2,2]}'Subpage_test/L1/L2/a/p);
add(wt2html, Parents of subpages, two levels up, without trailing slash or
name., p data-parsoid='{\dsr\:[0,9,0,0]}'a rel=\mw:WikiLink\
href=\../../../Subpage_test/L1/L2/..\
data-parsoid='{\stx\:\simple\,\a\:{\href\:\../../../Subpage_test/L1/L2/..\},\sa\:{\href\:\../..\},\dsr\:[0,9,2,2]}'Subpage_test/L1/L2/../a/p);
@@ -951,6 +952,7 @@
add(html2html, Width-sized image (using px, no following whitespace), p
data-parsoid='{\dsr\:[0,64,0,0]}'img
src=\http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg\;
alt=\640px-Foobar.jpg\
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/126019
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 85d4e39ff096d05386fd2f333cd6acea66ad6f90.
Change-Id: Ia0c77bc339e53cc319a8ffb3e1f91e53aa4ef392
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 48 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/19/126019/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 18257c4..b30fba4 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 26586404129dd11814a905c4182080b459327a98;
+var expectedSHA1 = 13ae5bc490f84a773c9b665d4c1f13f3439d9c3c;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50;
+var latestCommit = 85d4e39ff096d05386fd2f333cd6acea66ad6f90;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index ed9c03c..e2bf9f6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -10467,6 +10467,52 @@
!! end
###
+# Conflicting image format options.
+# First option specified should 'win'.
+# All three cases in each test should be identical.
+
+!! test
+Image with 'frameless' first.
+!! wikitext
+[[File:Foobar.jpg|frameless|caption]]
+
+[[File:Foobar.jpg|frameless|frame|caption]]
+
+[[File:Foobar.jpg|frameless|thumb|caption]]
+!! html/php
+pa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/ppa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/ppa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/p
+!! end
+
+!! test
+Image with 'frame' first.
+!! wikitext
+[[File:Foobar.jpg|frame|caption]]
+[[File:Foobar.jpg|frame|frameless|caption]]
+[[File:Foobar.jpg|frame|thumb|caption]]
+!! html/php
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+
+!! end
+
+!! test
+Image with 'thumb' first.
+!! wikitext
+[[File:Foobar.jpg|thumb|caption]]
+[[File:Foobar.jpg|thumb|frameless|caption]]
+[[File:Foobar.jpg|thumb|frame|caption]]
+!! html/php
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 85d4e39ff096d05386fd2f333cd6acea66ad6f90.
Change-Id: Ia0c77bc339e53cc319a8ffb3e1f91e53aa4ef392
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 48 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 18257c4..b30fba4 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 26586404129dd11814a905c4182080b459327a98;
+var expectedSHA1 = 13ae5bc490f84a773c9b665d4c1f13f3439d9c3c;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50;
+var latestCommit = 85d4e39ff096d05386fd2f333cd6acea66ad6f90;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index ed9c03c..e2bf9f6 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -10467,6 +10467,52 @@
!! end
###
+# Conflicting image format options.
+# First option specified should 'win'.
+# All three cases in each test should be identical.
+
+!! test
+Image with 'frameless' first.
+!! wikitext
+[[File:Foobar.jpg|frameless|caption]]
+
+[[File:Foobar.jpg|frameless|frame|caption]]
+
+[[File:Foobar.jpg|frameless|thumb|caption]]
+!! html/php
+pa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/ppa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/ppa href=/wiki/File:Foobar.jpg class=image title=captionimg
alt=caption
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
+/p
+!! end
+
+!! test
+Image with 'frame' first.
+!! wikitext
+[[File:Foobar.jpg|frame|caption]]
+[[File:Foobar.jpg|frame|frameless|caption]]
+[[File:Foobar.jpg|frame|thumb|caption]]
+!! html/php
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:1943px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/3/3a/Foobar.jpg; width=1941 height=220
class=thumbimage //a div class=thumbcaptioncaption/div/div/div
+
+!! end
+
+!! test
+Image with 'thumb' first.
+!! wikitext
+[[File:Foobar.jpg|thumb|caption]]
+[[File:Foobar.jpg|thumb|frameless|caption]]
+[[File:Foobar.jpg|thumb|frame|caption]]
+!! html/php
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120859
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50.
Change-Id: I492ca80a33b5579e70342ee1755a4fc74bcc1323
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 39 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/59/120859/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 31df077..18257c4 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 72f7939209d065b7014c2c8738703832ee962075;
+var expectedSHA1 = 26586404129dd11814a905c4182080b459327a98;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = bd2850d6125e6092b26d5af569b3f6e2b53a0228;
+var latestCommit = 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index e8c853e..e8e71b8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -21,12 +21,15 @@
# language=XXX set content language to XXX for this test
# variant=XXX set the variant of language for this test (eg zh-tw)
# disabled do not run test
-# parsoid parsoid-only test (not run by PHP parser)
-# php php-only test (not run by the parsoid parser)
+# parsoid parsoid-specific options (not run by PHP parser unless
+# the test includes an html/php section)
+# php php-only test (not run by the parsoid parser unless
+# the test includes an html/parsoid section)
# showtitle make the first line the title
# comment run through Linker::formatComment() instead of main parser
# 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
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
@@ -9662,7 +9665,7 @@
### Images
###
### For Parsoid-specific tests, see
- http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
+ https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
!! test
Simple image
@@ -9747,13 +9750,15 @@
!! test
Allow empty links in image captions (Bug 60753)
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb|Caption [[Link1]]
[[]]
[[Link2]]
]]
!! html/php
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divCaption a
href=/index.php?title=Link1amp;action=editamp;redlink=1 class=new
title=Link1 (page does not exist)Link1/a [[]] a
href=/index.php?title=Link2amp;action=editamp;redlink=1 class=new
title=Link2 (page does not exist)Link2/a/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:222px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg;
width=220 height=25 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divCaption a
href=/index.php?title=Link1amp;action=editamp;redlink=1 class=new
title=Link1 (page does not exist)Link1/a [[]] a
href=/index.php?title=Link2amp;action=editamp;redlink=1 class=new
title=Link2 (page does not exist)Link2/a/div/div/div
!! html/parsoid
figure class=mw-default-size typeof=mw:Image/Thumb
data-parsoid='{optList:[{ck:thumbnail,ak:thumb},{ck:caption,ak:Caption
[[Link1]]\n[[]]\n[[Link2]]\n}],dsr:[0,59,2,2]}'a href=./File:Foobar.jpg
data-parsoid='{a:{href:./File:Foobar.jpg},dsr:[2,null,null,null]}'img
resource=./File:Foobar.jpg
src=//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg height=25
width=220
data-parsoid='{a:{resource:./File:Foobar.jpg,height:25,width:220},sa:{resource:File:Foobar.jpg}}'//afigcaption
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50.
Change-Id: I492ca80a33b5579e70342ee1755a4fc74bcc1323
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 39 insertions(+), 17 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 31df077..18257c4 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 72f7939209d065b7014c2c8738703832ee962075;
+var expectedSHA1 = 26586404129dd11814a905c4182080b459327a98;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = bd2850d6125e6092b26d5af569b3f6e2b53a0228;
+var latestCommit = 722f3bd7f9316ed20e37d5e629f313ac3f4c4f50;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index e8c853e..e8e71b8 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -21,12 +21,15 @@
# language=XXX set content language to XXX for this test
# variant=XXX set the variant of language for this test (eg zh-tw)
# disabled do not run test
-# parsoid parsoid-only test (not run by PHP parser)
-# php php-only test (not run by the parsoid parser)
+# parsoid parsoid-specific options (not run by PHP parser unless
+# the test includes an html/php section)
+# php php-only test (not run by the parsoid parser unless
+# the test includes an html/parsoid section)
# showtitle make the first line the title
# comment run through Linker::formatComment() instead of main parser
# 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
#
# You can also set the following parser properties via test options:
# wgEnableUploads, wgAllowExternalImages, wgMaxTocLevel,
@@ -9662,7 +9665,7 @@
### Images
###
### For Parsoid-specific tests, see
- http://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
+ https://www.mediawiki.org/wiki/Parsoid/MediaWiki_DOM_spec#Images
!! test
Simple image
@@ -9747,13 +9750,15 @@
!! test
Allow empty links in image captions (Bug 60753)
+!! options
+thumbsize=220
!! wikitext
[[File:Foobar.jpg|thumb|Caption [[Link1]]
[[]]
[[Link2]]
]]
!! html/php
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg;
width=180 height=20 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divCaption a
href=/index.php?title=Link1amp;action=editamp;redlink=1 class=new
title=Link1 (page does not exist)Link1/a [[]] a
href=/index.php?title=Link2amp;action=editamp;redlink=1 class=new
title=Link2 (page does not exist)Link2/a/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:222px;a
href=/wiki/File:Foobar.jpg class=imageimg alt=
src=http://example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg;
width=220 height=25 class=thumbimage
srcset=http://example.com/images/thumb/3/3a/Foobar.jpg/330px-Foobar.jpg 1.5x,
http://example.com/images/thumb/3/3a/Foobar.jpg/440px-Foobar.jpg 2x //a
div class=thumbcaptiondiv class=magnifya href=/wiki/File:Foobar.jpg
class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divCaption a
href=/index.php?title=Link1amp;action=editamp;redlink=1 class=new
title=Link1 (page does not exist)Link1/a [[]] a
href=/index.php?title=Link2amp;action=editamp;redlink=1 class=new
title=Link2 (page does not exist)Link2/a/div/div/div
!! html/parsoid
figure class=mw-default-size typeof=mw:Image/Thumb
data-parsoid='{optList:[{ck:thumbnail,ak:thumb},{ck:caption,ak:Caption
[[Link1]]\n[[]]\n[[Link2]]\n}],dsr:[0,59,2,2]}'a href=./File:Foobar.jpg
data-parsoid='{a:{href:./File:Foobar.jpg},dsr:[2,null,null,null]}'img
resource=./File:Foobar.jpg
src=//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg height=25
width=220
data-parsoid='{a:{resource:./File:Foobar.jpg,height:25,width:220},sa:{resource:File:Foobar.jpg}}'//afigcaption
data-parsoid='{dsr:[null,57,null,null]}'Caption a rel=mw:WikiLink
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119412
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bd2850d6125e6092b26d5af569b3f6e2b53a0228.
Change-Id: Ib27c943c591262e5b397d00c5fc24b7e6d0ad4d9
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/12/119412/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index f8d76b1..1b8120d 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 45f9d280cc1c2980043e86494c7c28fcbf5e4c27;
+var expectedSHA1 = 72f7939209d065b7014c2c8738703832ee962075;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e0e58939694c085c04518816d03b98b03407e6ce;
+var latestCommit = bd2850d6125e6092b26d5af569b3f6e2b53a0228;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index cc9e939..0a2e87f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -10339,7 +10339,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
!! end
@@ -10349,7 +10349,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption|lang=de]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/index.php?title=File:Foobar.svgamp;lang=de class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png
1.5x,
http://example.com/images/thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/index.php?title=File:Foobar.svgamp;lang=de class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png
1.5x,
http://example.com/images/thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
!! end
@@ -10359,7 +10359,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption|lang=invalid.language.code]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divlang=invalid.language.code/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bd2850d6125e6092b26d5af569b3f6e2b53a0228.
Change-Id: Ib27c943c591262e5b397d00c5fc24b7e6d0ad4d9
---
M tests/fetch-parserTests.txt.js
M tests/parserTests.txt
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index f8d76b1..1b8120d 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 45f9d280cc1c2980043e86494c7c28fcbf5e4c27;
+var expectedSHA1 = 72f7939209d065b7014c2c8738703832ee962075;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e0e58939694c085c04518816d03b98b03407e6ce;
+var latestCommit = bd2850d6125e6092b26d5af569b3f6e2b53a0228;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index cc9e939..0a2e87f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -10339,7 +10339,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
!! end
@@ -10349,7 +10349,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption|lang=de]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/index.php?title=File:Foobar.svgamp;lang=de class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png
1.5x,
http://example.com/images/thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/index.php?title=File:Foobar.svgamp;lang=de class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/langde-180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/langde-270px-Foobar.svg.png
1.5x,
http://example.com/images/thumb/f/ff/Foobar.svg/langde-360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divcaption/div/div/div
!! end
@@ -10359,7 +10359,7 @@
!! wikitext
[[File:Foobar.svg|thumb|caption|lang=invalid.language.code]]
!! html
-div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=180 class=thumbimage
srcset=http://example.com/images/thumb/f/ff/Foobar.svg/270px-Foobar.svg.png
1.5x, http://example.com/images/thumb/f/ff/Foobar.svg/360px-Foobar.svg.png 2x
//a div class=thumbcaptiondiv class=magnifya
href=/wiki/File:Foobar.svg class=internal title=Enlargeimg
src=/skins/common/images/magnify-clip.png width=15 height=11 alt=
//a/divlang=invalid.language.code/div/div/div
+div class=thumb trightdiv class=thumbinner style=width:182px;a
href=/wiki/File:Foobar.svg class=imageimg alt=
src=http://example.com/images/thumb/f/ff/Foobar.svg/180px-Foobar.svg.png;
width=180 height=135 class=thumbimage
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/118750
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e0e58939694c085c04518816d03b98b03407e6ce.
Both parsoid and core are now in sync with renamed sections and
combined tests for html/php and html/parsoid. This commit just
records the synchronization point.
Change-Id: I65eda05a6ab1c28a7b6eccb3b773cf9d90f033a4
---
M tests/fetch-parserTests.txt.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/50/118750/1
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 7810a14..f8d76b1 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 5a4cc734945349d141e33d044148b0cd578935c2;
+var expectedSHA1 = 45f9d280cc1c2980043e86494c7c28fcbf5e4c27;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 0e0ffe4d17b2aea1a2da1fadc46e08b07708fe79;
+var latestCommit = e0e58939694c085c04518816d03b98b03407e6ce;
var fs = require('fs'),
path = require('path'),
--
To view, visit https://gerrit.wikimedia.org/r/118750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65eda05a6ab1c28a7b6eccb3b773cf9d90f033a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e0e58939694c085c04518816d03b98b03407e6ce.
Both parsoid and core are now in sync with renamed sections and
combined tests for html/php and html/parsoid. This commit just
records the synchronization point.
Change-Id: I65eda05a6ab1c28a7b6eccb3b773cf9d90f033a4
---
M tests/fetch-parserTests.txt.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 7810a14..f8d76b1 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 5a4cc734945349d141e33d044148b0cd578935c2;
+var expectedSHA1 = 45f9d280cc1c2980043e86494c7c28fcbf5e4c27;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 0e0ffe4d17b2aea1a2da1fadc46e08b07708fe79;
+var latestCommit = e0e58939694c085c04518816d03b98b03407e6ce;
var fs = require('fs'),
path = require('path'),
--
To view, visit https://gerrit.wikimedia.org/r/118750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65eda05a6ab1c28a7b6eccb3b773cf9d90f033a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit ffbac06a280d7af318e8ba1e9bc83cf119544fa4.
Some CSS sanitization tests have been renamed, and we are newly failing
one related to Opera's -o-link property. The blacklist has been updated
and bug 62267 has been opened.
There's also a failure in the formatNum parser function, but our javascript
implementation of parser functions is deprecated.
Change-Id: Ib40e110aede6dbb81908081f9fc59d1744df58bc
---
M tests/fetch-parserTests.txt.js
M tests/parserTests-blacklist.js
M tests/parserTests.txt
3 files changed, 60 insertions(+), 29 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/fetch-parserTests.txt.js b/tests/fetch-parserTests.txt.js
index 06bbccf..7810a14 100755
--- a/tests/fetch-parserTests.txt.js
+++ b/tests/fetch-parserTests.txt.js
@@ -11,9 +11,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = da62970f15abe3a6ce06db50880817de5e00d65a;
+var expectedSHA1 = 5a4cc734945349d141e33d044148b0cd578935c2;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = f52f3db6539ddde6f8c74165efc292a1121486b7;
+var latestCommit = 0e0ffe4d17b2aea1a2da1fadc46e08b07708fe79;
var fs = require('fs'),
path = require('path'),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 89389a0..1226d95 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -290,11 +290,12 @@
add(wt2html, Bug 2095: link with pipe and three closing brackets, version
2, p data-parsoid='{\dsr\:[0,35,0,0]}'a rel=\mw:WikiLink\
href=\./Main_Page\
data-parsoid='{\stx\:\piped\,\a\:{\href\:\./Main_Page\},\sa\:{\href\:\Main
Page\},\autoInsertedEnd\:true,\dsr\:[0,35,12,0]}'/aa
rel=\mw:ExtLink\ href=\http://example.com/\;
data-parsoid='{\targetOff\:32,\contentOffsets\:[32,32],\dsr\:[12,33,20,1]}'/a/p);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,55,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'Magic
div/div);
add(wt2html, Bug 2304: HTML attribute safety (unsafe breakout parameter 2;
2309), div style=\float: right; alert(document.cookie)\ about=\#mwt1\
typeof=\mw:Transclusion\
data-mw='{\parts\:[{\template\:{\target\:{\wt\:\div
style\,\href\:\./Template:Div_style\},\params\:{\1\:{\wt\:
lt;scriptalert(document.cookie)lt;/script\}},\i\:0}}]}'
data-parsoid='{\stx\:\html\,\a\:{\style\:\float: right;
alert(document.cookie)\},\sa\:{\style\:\float: right;
{{{1}}}\},\dsr\:[0,56,null,null],\pi\:[[{\k\:\1\,\spc\:[\\,\\,\\,\\]}]]}'Magic
div/div);
-add(wt2html, CSS safety test: vertical tab, p style=\/* insecure input
*/\ data-parsoid='{\stx\:\html\,\a\:{\style\:\/* insecure input
*/\},\sa\:{\style\:\font-size: 100px;
background-image:urlb(https://www.google.com/images/srpr/logo6w.png)\},\dsr\:[0,104,99,4]}'A/p);
-add(wt2html, MSIE CSS safety test: Fullwidth, p style=\font-size:
100px; color: ｅｘｐｒｅｓｓｉｏｎ((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[0,75,70,4]}'A/p\ndiv
style=\top:ＥＸＰＲＥＳＳＩＯＮ(alert())\
data-parsoid='{\stx\:\html\,\dsr\:[76,120,37,6]}'B/div);
-add(wt2html, MSIE CSS safety test: IPA extensions, div
style=\background-image:uʀʟ(javascript:alert())\
data-parsoid='{\stx\:\html\,\dsr\:[0,61,54,6]}'A/div\np
style=\font-size: 100px; color: expʀessɪoɴ((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[62,137,70,4]}'B/p);
-add(wt2html, MSIE CSS safety test: sup/sub script, div
style=\background-image:url⁽javascript:alert())\
data-parsoid='{\stx\:\html\,\dsr\:[0,61,54,6]}'A/div\ndiv
style=\background-image:url₍javascript:alert())\
data-parsoid='{\stx\:\html\,\dsr\:[62,123,54,6]}'B/div\np
style=\font-size: 100px; color: expressioⁿ((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[124,199,70,4]}'C/p);
-add(wt2html, MSIE CSS safety test: Repetition markers, p
style=\font-size: 100px; color: expres〱ion((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[0,75,70,4]}'A/p\np
style=\font-size: 100px; color: expresゝion((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[76,151,70,4]}'B/p\np
style=\font-size: 100px; color: expresーion((title='XSSed'),'red')\
data-parsoid='{\stx\:\html\,\dsr\:[152,227,70,4]}'C/p\np
style=\font-size: 100px; color:
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/87346
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2.
Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests.txt
2 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/46/87346/1
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 056a741..a8d6318 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
+var expectedSHA1 = 49478d2615f9f51c78b5a9b941015887817715ba;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
+var latestCommit = bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index b2919dc..3266b16 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -4634,6 +4634,22 @@
/p
!! end
+!! article
+MemoryAlpha:AlphaTest
+!! text
+This is an article in the MemoryAlpha namespace
+(which shadows the memoryalpha interwiki link).
+!! endarticle
+
+!! test
+Namespace takes precedence over interwiki link (bug 51680)
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa href=/wiki/MemoryAlpha:AlphaTest
title=MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
!! test
Piped link to namespace
!! input
--
To view, visit https://gerrit.wikimedia.org/r/87346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2.
Added Namespace takes precedence over interwiki link (bug 51680) to
blacklist for html2wt and html2html because without rel=mw:WikiLink the
link is not recognized correctly.
Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 33 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
Marcoil: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 056a741..a8d6318 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
+var expectedSHA1 = 49478d2615f9f51c78b5a9b941015887817715ba;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
+var latestCommit = bc97a03f06bfb4bfd33cd2ec2a127c2f607e34e2;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index 8b0e514..5bcd207 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -788,6 +788,7 @@
add(html2html, Link with HTML entity in suffix / tail);
add(html2html, Link with multiple pipes);
add(html2html, Link to namespaces);
+add(html2html, Namespace takes precedence over interwiki link (bug 51680));
add(html2html, Piped link to namespace);
add(html2html, Link containing % (not as a hex sequence));
add(html2html, Link containing % as a single hex sequence interpreted to
char);
@@ -1426,6 +1427,7 @@
add(html2wt, Link with HTML entity in suffix / tail);
add(html2wt, Link with multiple pipes);
add(html2wt, Link to namespaces);
+add(html2wt, Namespace takes precedence over interwiki link (bug 51680));
add(html2wt, Piped link to namespace);
add(html2wt, Link containing % (not as a hex sequence));
add(html2wt, Link containing % as a single hex sequence interpreted to
char);
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index b2919dc..79e91fb 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -4634,6 +4634,35 @@
/p
!! end
+!! article
+MemoryAlpha:AlphaTest
+!! text
+This is an article in the MemoryAlpha namespace
+(which shadows the memoryalpha interwiki link).
+!! endarticle
+
+!! test
+Namespace takes precedence over interwiki link (bug 51680)
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa href=/wiki/MemoryAlpha:AlphaTest
title=MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
+# The previous test doesn't work correctly in html2*, due to not recognizing
the
+# link as an internal one. This one checks for the correct behavior.
+!! test
+Link to namespace preferred over interwiki with correct rel attribute
+!! options
+parsoid=html2wt,html2html
+!! input
+[[MemoryAlpha:AlphaTest]]
+!! result
+pa rel=mw:WikiLink
href=./MemoryAlpha:AlphaTestMemoryAlpha:AlphaTest/a
+/p
+!! end
+
!! test
Piped link to namespace
!! input
--
To view, visit https://gerrit.wikimedia.org/r/87346
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic21439a6b65eff1d0f9ce9ab4a9f9bb66f9ed0eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: Marcoil marc...@wikimedia.org
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
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84448
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e7ce589265c7500759735d9e5c8ecbd008073fc9.
The blacklist changes are primarily related to bug 6200.
Change-Id: I2eaa9729298638210feec166265a1ca4c7eef3e1
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 107 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/48/84448/1
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index ee96cc7..056a741 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 2900c9165e78a62167667f740fac1385fa450cfe;
+var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 2305dbbd2aa5723e53d116e04d97730fe0811629;
+var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index e33f0b9..33fd55c 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -43,6 +43,7 @@
add(wt2html, Comment on its own line post-expand);
add(wt2html, Comment on its own line post-expand with non-significant
whitespace);
add(wt2html, Tabs don't trigger preformatted text);
+add(wt2html, Bug 52763: Preformatted in blockquote);
add(wt2html, Templates: Indent-Pre: 1a. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1b. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1e. Wrapping should be based on
expanded content);
@@ -51,6 +52,7 @@
add(wt2html, 2a. Indent-Pre and tables);
add(wt2html, 2b. Indent-Pre and tables);
add(wt2html, 2c. Indent-Pre and tables (bug 42252));
+add(wt2html, 3b. Indent-Pre and block tags (pre-content on separate line));
add(wt2html, 4. Multiple spaces at start-of-line);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content);
add(wt2html, Definition Lists: Nesting: Multi-level (Parsoid only));
@@ -400,7 +402,6 @@
add(wt2html, anchorencode trims spaces);
add(wt2html, anchorencode deals with links);
add(wt2html, anchorencode encodes like the TOC generator: (bug 18431));
-add(wt2html, Bug 6200: blockquotes and paragraph formatting);
add(wt2html, Parsing of overlapping (improperly nested) inline html tags
(Parsoid));
add(wt2html, Self-link in language variants);
add(wt2html, Link to another existing title shouldn't be parsed as
self-link even if it's a variant of this title);
@@ -715,12 +716,14 @@
add(html2html, nowiki 3);
add(html2html, Preformatted text);
add(html2html, Tabs don't trigger preformatted text);
+add(html2html, Bug 52763: Preformatted in blockquote);
add(html2html, pre with attributes (bug 3202));
add(html2html, pre with width attribute (bug 3202));
add(html2html, pre with forbidden attribute (bug 3202));
add(html2html, pre with forbidden attribute values (bug 3202));
add(html2html, nowiki inside pre (bug 13238));
add(html2html, 3a. Indent-Pre and block tags (single-line html));
+add(html2html, 3b. Indent-Pre and block tags (pre-content on separate
line));
add(html2html, 4. Multiple spaces at start-of-line);
add(html2html, 6. Pre-blocks should extend across lines with leading WS
even when there is no wrappable content);
add(html2html, HTML-pre: 1. embedded newlines);
@@ -1250,15 +1253,19 @@
add(html2wt, Comment in template title);
add(html2wt, Comment on its own line post-expand);
add(html2wt, Comment on its own line post-expand with non-significant
whitespace);
-add(html2wt, Block tag on one line);
-add(html2wt, Block tag on both lines);
+add(html2wt, Block tag on one line (div));
+add(html2wt, Block tag on one line (blockquote));
+add(html2wt, Block tag on both lines (div));
+add(html2wt, Block tag on both lines (blockquote));
add(html2wt, Multiple lines without block tags);
add(html2wt, Empty lines between lines with block tags);
add(html2wt, Preformatted text);
add(html2wt, Tabs don't trigger preformatted text);
add(html2wt, pre with nowiki inside (compatibility with 1.6 and
earlier));
add(html2wt, Regression with preformatted in center);
-add(html2wt, Bug 6200: Preformatted in blockquote);
+add(html2wt, Bug 52763: Preformatted in blockquote);
+add(html2wt, Bug 51086: Double newlines in blockquotes should be turned
into paragraphs);
+add(html2wt, Bug 15491: ins/del in blockquote);
add(html2wt, pre with attributes
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e7ce589265c7500759735d9e5c8ecbd008073fc9.
The blacklist changes are primarily related to bug 6200.
Change-Id: I2eaa9729298638210feec166265a1ca4c7eef3e1
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 107 insertions(+), 47 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index ee96cc7..056a741 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 2900c9165e78a62167667f740fac1385fa450cfe;
+var expectedSHA1 = d5f8745cfeb34ce00762a47f0ed883c9c98b4b56;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 2305dbbd2aa5723e53d116e04d97730fe0811629;
+var latestCommit = e450b18e09b90a67dcd8f216216c9fa7c0752038;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index e33f0b9..33fd55c 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -43,6 +43,7 @@
add(wt2html, Comment on its own line post-expand);
add(wt2html, Comment on its own line post-expand with non-significant
whitespace);
add(wt2html, Tabs don't trigger preformatted text);
+add(wt2html, Bug 52763: Preformatted in blockquote);
add(wt2html, Templates: Indent-Pre: 1a. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1b. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1e. Wrapping should be based on
expanded content);
@@ -51,6 +52,7 @@
add(wt2html, 2a. Indent-Pre and tables);
add(wt2html, 2b. Indent-Pre and tables);
add(wt2html, 2c. Indent-Pre and tables (bug 42252));
+add(wt2html, 3b. Indent-Pre and block tags (pre-content on separate line));
add(wt2html, 4. Multiple spaces at start-of-line);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content);
add(wt2html, Definition Lists: Nesting: Multi-level (Parsoid only));
@@ -400,7 +402,6 @@
add(wt2html, anchorencode trims spaces);
add(wt2html, anchorencode deals with links);
add(wt2html, anchorencode encodes like the TOC generator: (bug 18431));
-add(wt2html, Bug 6200: blockquotes and paragraph formatting);
add(wt2html, Parsing of overlapping (improperly nested) inline html tags
(Parsoid));
add(wt2html, Self-link in language variants);
add(wt2html, Link to another existing title shouldn't be parsed as
self-link even if it's a variant of this title);
@@ -715,12 +716,14 @@
add(html2html, nowiki 3);
add(html2html, Preformatted text);
add(html2html, Tabs don't trigger preformatted text);
+add(html2html, Bug 52763: Preformatted in blockquote);
add(html2html, pre with attributes (bug 3202));
add(html2html, pre with width attribute (bug 3202));
add(html2html, pre with forbidden attribute (bug 3202));
add(html2html, pre with forbidden attribute values (bug 3202));
add(html2html, nowiki inside pre (bug 13238));
add(html2html, 3a. Indent-Pre and block tags (single-line html));
+add(html2html, 3b. Indent-Pre and block tags (pre-content on separate
line));
add(html2html, 4. Multiple spaces at start-of-line);
add(html2html, 6. Pre-blocks should extend across lines with leading WS
even when there is no wrappable content);
add(html2html, HTML-pre: 1. embedded newlines);
@@ -1250,15 +1253,19 @@
add(html2wt, Comment in template title);
add(html2wt, Comment on its own line post-expand);
add(html2wt, Comment on its own line post-expand with non-significant
whitespace);
-add(html2wt, Block tag on one line);
-add(html2wt, Block tag on both lines);
+add(html2wt, Block tag on one line (div));
+add(html2wt, Block tag on one line (blockquote));
+add(html2wt, Block tag on both lines (div));
+add(html2wt, Block tag on both lines (blockquote));
add(html2wt, Multiple lines without block tags);
add(html2wt, Empty lines between lines with block tags);
add(html2wt, Preformatted text);
add(html2wt, Tabs don't trigger preformatted text);
add(html2wt, pre with nowiki inside (compatibility with 1.6 and
earlier));
add(html2wt, Regression with preformatted in center);
-add(html2wt, Bug 6200: Preformatted in blockquote);
+add(html2wt, Bug 52763: Preformatted in blockquote);
+add(html2wt, Bug 51086: Double newlines in blockquotes should be turned
into paragraphs);
+add(html2wt, Bug 15491: ins/del in blockquote);
add(html2wt, pre with attributes (bug 3202));
add(html2wt, pre with width
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 2305dbbd2aa5723e53d116e04d97730fe0811629.
The following bugs are related to the blacklist changes:
* Bug 6200, bug 52761: newlines and preformatted in blockquote
* Bug 52938: Tabs do not cause indent-pres, only spaces do
* Bug 49926: posessives and italics
* Bug 52762: lines with WS and comments only should be transparent to all
Change-Id: I5a8281a67e1978459a1f14dd4503ea1e497a8fe8
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 177 insertions(+), 102 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index a3426bc..ee96cc7 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = 3aa4ff168f50d5a9981372ffcbb5b501c13e;
+var expectedSHA1 = 2900c9165e78a62167667f740fac1385fa450cfe;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = 9b22f7bc26f770e339bd9fa6b3542c84bb7723eb;
+var latestCommit = 2305dbbd2aa5723e53d116e04d97730fe0811629;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index c7ce45a..ce2fa66 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -38,7 +38,8 @@
add(wt2html, Extra newlines: More paragraphs with indented comment);
add(wt2html, Extra newlines between heading and content are swallowed);
add(wt2html, Italics and bold);
-add(wt2html, Italics and possessives);
+add(wt2html, Italics and possessives (1));
+add(wt2html, Italics and possessives (2));
add(wt2html, Italicized possessive);
add(wt2html, Non-word characters don't terminate tag names (bug 17663,
40670, 52022));
add(wt2html, Bare pipe character (bug 52363));
@@ -46,7 +47,7 @@
add(wt2html, Entities inside nowiki);
add(wt2html, Comment on its own line post-expand);
add(wt2html, Comment on its own line post-expand with non-significant
whitespace);
-add(wt2html, Bug 6200: Preformatted in blockquote);
+add(wt2html, Tabs don't trigger preformatted text);
add(wt2html, Templates: Indent-Pre: 1a. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1b. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1e. Wrapping should be based on
expanded content);
@@ -55,7 +56,6 @@
add(wt2html, 2a. Indent-Pre and tables);
add(wt2html, 2b. Indent-Pre and tables);
add(wt2html, 2c. Indent-Pre and tables (bug 42252));
-add(wt2html, 3b. Indent-Pre and block tags (pre-content on separate line));
add(wt2html, 4. Multiple spaces at start-of-line);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content);
add(wt2html, Definition Lists: Nesting: Multi-level (Parsoid only));
@@ -84,7 +84,8 @@
add(wt2html, Handling html with a div self-closing tag);
add(wt2html, 2. Lists with start-of-line-transparent tokens before bullets:
Template close);
add(wt2html, List interrupted by empty line or heading);
-add(wt2html, Single-comment whitespace lines dont break lists, and so do
multi-comment whitespace lines);
+add(wt2html, Single-comment whitespace lines dont break lists, and neither
do multi-comment whitespace lines);
+add(wt2html, Replacing whitespace with tabs still doesn't break the list
(gerrit 78327));
add(wt2html, Test the li-hack\n(Cannot test this with PHP parser since it
relies on Tidy for the hack));
add(wt2html, Unclosed formatting tags that straddle lists are closed and
reopened\n(Parsoid-only since php parser generates broken html -- relies on
Tidy to fix up));
add(wt2html, Magic Word: {{CURRENTMONTH1}});
@@ -414,6 +415,7 @@
add(wt2html, anchorencode trims spaces);
add(wt2html, anchorencode deals with links);
add(wt2html, anchorencode encodes like the TOC generator: (bug 18431));
+add(wt2html, Bug 6200: blockquotes and paragraph formatting);
add(wt2html, Parsing of overlapping (improperly nested) inline html tags
(Parsoid));
add(wt2html, Self-link in language variants);
add(wt2html, Link to another existing title shouldn't be parsed as
self-link even if it's a variant of this title);
@@ -534,7 +536,9 @@
// Blacklist for wt2wt
add(wt2wt, Italics and bold);
-add(wt2wt, Italics and possessives);
+add(wt2wt, Italics and possessives (1));
+add(wt2wt, Italics and possessives (2));
+add(wt2wt, Italics and possessives (3));
add(wt2wt, Italics and bold: 2-quote opening sequence: (2,3));
add(wt2wt, Italics and
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78833
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 9b22f7bc26f770e339bd9fa6b3542c84bb7723eb.
Change-Id: I3a06fbce0858507ac86e1832e7cf3456cfda1da4
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests.txt
2 files changed, 424 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/33/78833/1
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index aa6d787..a3426bc 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d1619d3fe6fc04c2b33a0ecb6c28ae1ee4d28270;
+var expectedSHA1 = 3aa4ff168f50d5a9981372ffcbb5b501c13e;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e07be1427ba6560fe8b08c720bfed9a2aa87f290;
+var latestCommit = 9b22f7bc26f770e339bd9fa6b3542c84bb7723eb;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index 3b5ecaf..41d49d1 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -196,7 +196,11 @@
b
a
-!--foo--!--More than 1 comment disables stripping of this line!--
+!--foo--!--More than 1 comment, still stripped--
+b
+
+a
+ !--foo-- ! !-- bar --
b
a
@@ -228,7 +232,11 @@
/p
hr /
pa
-/ppb
+b
+/p
+hr /
+pa
+b
/p
hr /
pa
@@ -288,7 +296,7 @@
b
a
- !--foo--!--More than 1 comment disables stripping of this line!--
+ !--foo--!--More than 1 comment doesn't disable stripping of this line!--
b
a
@@ -311,7 +319,7 @@
/p
hr /
pa
-/ppb
+b
/p
hr /
pa
@@ -871,6 +879,74 @@
/p
!! end
+!! test
+wbr is valid wikitext (bug 52468)
+!! input
+wbr
+!! result
+pwbr /
+/p
+!! end
+
+# strike is HTML4, s is HTML4/5.
+!! test
+s or strike for strikethrough
+!! input
+strikestrike/strike
+
+ss/s
+!! result
+pstrikestrike/strike
+/ppss/s
+/p
+!! end
+
+!! test
+Non-word characters don't terminate tag names (bug 17663, 40670, 52022)
+!! input
+b→ doesn't work! /b
+
+bä doesn't work! /b
+
+boo works fine /b
+
+s.foofoo/s
+
+s.foos.foo/s.foo
+
+sub-ID#1
+!! result
+plt;b→gt; doesn't work! lt;/bgt;
+/pplt;bägt; doesn't work! lt;/bgt;
+/pplt;boogt; works fine lt;/bgt;
+/pplt;s.foogt;foolt;/sgt;
+/pplt;s.foogt;s.foolt;/s.foogt;
+/pplt;sub-ID#1gt;
+/p
+!! end
+
+###
+### Special characters
+###
+
+!! test
+Bare pipe character (bug 52363)
+!! input
+|
+!! result
+p|
+/p
+!! end
+
+!! test
+Bare pipe character from a template (bug 52363)
+!! input
+{{pipe}}
+!! result
+p|
+/p
+!! end
+
###
### nowiki test cases
###
@@ -1276,8 +1352,6 @@
!! end
-# Expected output in the following test is not really expected (there should be
-# pre in the output) -- it's only testing for well-formedness.
!! test
Bug 6200: Preformatted in blockquote
!! input
@@ -1286,7 +1360,53 @@
/blockquote
!! result
blockquote
- Blah
+preBlah
+/pre
+/blockquote
+
+!! end
+
+!! test
+Bug 51086: Double newlines in blockquotes should be turned into paragraphs
+!! input
+blockquote
+Foo
+
+Bar
+/blockquote
+!! result
+blockquote
+pFoo
+/ppBar
+/p
+/blockquote
+
+!! end
+
+!! test
+Bug 15491: ins/del in blockquote
+!! input
+blockquote
+Foo delbar/del insbaz/ins quux
+/blockquote
+!! result
+blockquote
+pFoo delbar/del insbaz/ins quux
+/p
+/blockquote
+
+!! end
+
+# Note that the p-wrapping is newline sensitive, which could be
+# considered a bug: tidy will wrap only the 'Foo' in the example
+# below in a p tag. (see comment 23-25 of bug #6200)
+!! test
+Bug 15491: ins/del in blockquote (2)
+!! input
+blockquoteFoo delbar/del insbaz/ins quux
+/blockquote
+!! result
+blockquoteFoo delbar/del insbaz/ins quux
/blockquote
!! end
@@ -1801,7 +1921,8 @@
/pre
/center
blockquote
- foo
+prefoo
+/pre
/blockquote
tabletrtd
prefoo
@@ -5448,21 +5569,20 @@
!!end
!!test
-Single-comment whitespace lines dont break lists, but multi-comment whitespace
lines do
+Single-comment whitespace lines dont break lists, and so do multi-comment
whitespace lines
!!input
*a
!--This line will NOT split the list--
*b
!--This line will NOT split the list either--
*c
- !--foo-- !--This line with more than 1 comment will split the list--
+ !--foo-- ! !--This line NOT split the list either--
*d
!!result
ullia
/lilib
/lilic
-/li/ul
-ullid
+/lilid
/li/ul
!!end
@@ -5597,6 +5717,11 @@
### Magic Words
###
+# Note that the current date is hard-coded as
+# 1970-01-01T00:02:03Z (a Thursday)
+# when running parser tests. The timezone is also fixed to GMT, so
+# local date will be identical to current date.
+
!! test
Magic Word: {{CURRENTDAY}}
!! input
@@ -5643,6
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit 9b22f7bc26f770e339bd9fa6b3542c84bb7723eb.
New tests were added for the following Parsoid bugs, all of which currently
fail:
* Bug 52762: ignore lines with nothing but two-or-more comments
* Bug 52760: close tags are stripped (found in test for bug 17663)
* Bug 52363: bare pipes
* Bug 52761: preformatted in blockquote (should be parsed like div)
In addition, a number of new tests were added for preprocessor magic
words (gerrit change I79023a1585f92be6c0cea13a462ae091a60838d3) which
aren't currently supported by Parsoid's preprocessor implementation.
Change-Id: I3a06fbce0858507ac86e1832e7cf3456cfda1da4
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 589 insertions(+), 59 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index aa6d787..a3426bc 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = d1619d3fe6fc04c2b33a0ecb6c28ae1ee4d28270;
+var expectedSHA1 = 3aa4ff168f50d5a9981372ffcbb5b501c13e;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = e07be1427ba6560fe8b08c720bfed9a2aa87f290;
+var latestCommit = 9b22f7bc26f770e339bd9fa6b3542c84bb7723eb;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index aca39c4..82ef94e 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -33,6 +33,7 @@
// ### DO NOT REMOVE THIS LINE ### (start of automatically-generated section)
// Blacklist for wt2html
+add(wt2html, Paragraphs with newline spacing with comment lines in
between);
add(wt2html, Paragraphs with newline spacing with non-empty white-space
lines in between);
add(wt2html, Paragraphs with newline spacing with non-empty mixed comment
and white-space lines in between);
add(wt2html, Extra newlines: More paragraphs with indented comment);
@@ -40,9 +41,13 @@
add(wt2html, Italics and bold);
add(wt2html, Italics and possessives);
add(wt2html, Italicized possessive);
+add(wt2html, Non-word characters don't terminate tag names (bug 17663,
40670, 52022));
+add(wt2html, Bare pipe character (bug 52363));
+add(wt2html, Bare pipe character from a template (bug 52363));
add(wt2html, Entities inside nowiki);
add(wt2html, Comment on its own line post-expand);
add(wt2html, Comment on its own line post-expand with non-significant
whitespace);
+add(wt2html, Bug 6200: Preformatted in blockquote);
add(wt2html, Templates: Indent-Pre: 1a. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1b. Templates that break a line should
suppress pre);
add(wt2html, Templates: Indent-Pre: 1e. Wrapping should be based on
expanded content);
@@ -52,6 +57,7 @@
add(wt2html, 2a. Indent-Pre and tables);
add(wt2html, 2b. Indent-Pre and tables);
add(wt2html, 2c. Indent-Pre and tables (bug 42252));
+add(wt2html, 3b. Indent-Pre and block tags (pre-content on separate line));
add(wt2html, 4. Multiple spaces at start-of-line);
add(wt2html, 6. Pre-blocks should extend across lines with leading WS even
when there is no wrappable content);
add(wt2html, Definition Lists: Nesting: Multi-level (Parsoid only));
@@ -80,18 +86,38 @@
add(wt2html, Handling html with a div self-closing tag);
add(wt2html, 2. Lists with start-of-line-transparent tokens before bullets:
Template close);
add(wt2html, List interrupted by empty line or heading);
-add(wt2html, Single-comment whitespace lines dont break lists, but
multi-comment whitespace lines do);
+add(wt2html, Single-comment whitespace lines dont break lists, and so do
multi-comment whitespace lines);
add(wt2html, Test the li-hack\n(Cannot test this with PHP parser since it
relies on Tidy for the hack));
add(wt2html, Unclosed formatting tags that straddle lists are closed and
reopened\n(Parsoid-only since php parser generates broken html -- relies on
Tidy to fix up));
+add(wt2html, Magic Word: {{CURRENTMONTH1}});
+add(wt2html, Magic Words LOCAL (UTC));
add(wt2html, Magic Word: {{FULLPAGENAMEE}});
+add(wt2html, Magic Word: {{TALKSPACE}});
+add(wt2html, Magic Word: {{TALKSPACE}}, same namespace);
+add(wt2html, Magic Word: {{TALKSPACEE}});
+add(wt2html, Magic Word: {{SUBJECTSPACE}});
+add(wt2html, Magic Word: {{SUBJECTSPACE}}, same namespace);
+add(wt2html, Magic Word: {{SUBJECTSPACE}}, main namespace);
+add(wt2html, Magic Word: {{SUBJECTSPACEE}});
add(wt2html,
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e07be1427ba6560fe8b08c720bfed9a2aa87f290.
It contains new parser tests for bug 44498 and bug 49400. These bugs
are not yet fixed, so it also updates the blacklist to account for the
new failures.
Change-Id: Ib5ff2443dd29c85c2aef4a9638385e0ffbfb82cb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 61 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 1f92ba5..aa6d787 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = dbf294faadb0fca67f9a267e6864d40909581788;
+var expectedSHA1 = d1619d3fe6fc04c2b33a0ecb6c28ae1ee4d28270;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = cd9ad736027025a784499807668da50865ec18eb;
+var latestCommit = e07be1427ba6560fe8b08c720bfed9a2aa87f290;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index 69e28e2..d19c480 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -62,6 +62,8 @@
add(wt2html, External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check));
add(wt2html, Non-extlinks in brackets);
add(wt2html, Template-generated table cell attributes and cell content);
+add(wt2html, Template-generated table cell attributes and cell content
(2));
+add(wt2html, Template-generated table cell attributes and cell content
(3));
add(wt2html, Link containing \#\ and \#\ % as a hex sequences- these
are valid section anchors\nExample for such a section: == ==);
add(wt2html, Link containing \#\ and \#\ as a hex sequences);
add(wt2html, Link containing double-single-quotes '' in text embedded in
italics (bug 4598 sanity check));
@@ -199,6 +201,7 @@
add(wt2html, Simple image (using File: namespace, now canonical));
add(wt2html, Image with caption);
add(wt2html, Image with empty attribute);
+add(wt2html, Image with attributes from template.);
add(wt2html, Image with link tails);
add(wt2html, Image with multiple captions -- only last one is accepted);
add(wt2html, Image with width attribute at different positions);
@@ -904,6 +907,7 @@
add(html2html, Simple image (using File: namespace, now canonical));
add(html2html, Image with caption);
add(html2html, Image with empty attribute);
+add(html2html, Image with attributes from template.);
add(html2html, Image with link tails);
add(html2html, Image with multiple captions -- only last one is accepted);
add(html2html, Image with width attribute at different positions);
@@ -1393,6 +1397,8 @@
add(html2wt, Table security: embedded pipes
(http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html));
add(html2wt, Indented table markup mixed with indented pre content
(proposed in bug 6200));
add(html2wt, Template-generated table cell attributes and cell content);
+add(html2wt, Template-generated table cell attributes and cell content
(2));
+add(html2wt, Template-generated table cell attributes and cell content
(3));
add(html2wt, Table with row followed by newlines and table heading);
add(html2wt, Table with empty line following the start tag);
add(html2wt, Table attributes with empty value);
@@ -1679,6 +1685,7 @@
add(html2wt, Simple image (using File: namespace, now canonical));
add(html2wt, Image with caption);
add(html2wt, Image with empty attribute);
+add(html2wt, Image with attributes from template.);
add(html2wt, Image with link tails);
add(html2wt, Image with multiple captions -- only last one is accepted);
add(html2wt, Image with width attribute at different positions);
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index aedbf45..76388d9 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -121,6 +121,19 @@
!! endarticle
!! article
+Template:table_cells
+!! text
+{{table_attribs}} || Bar || Baz
+!! endarticle
+
+!! article
+Template:image_attribs
+!! text
+noinclude
+[[File:foobar.jpg|/noincluderight|Caption textnoinclude]]/noinclude
+!! endarticle
+
+!! article
A?b
!! text
Weirdo titles!
@@ -3851,6 +3864,36 @@
table
tr
td style=color: red Foo
+/td/tr/table
+
+!! end
+
+!! test
+Template-generated table cell attributes and cell content (2)
+!! input
+{|
+|align=center {{table_attribs}}
+|}
+!! result
+table
+tr
+td align=center style=color: red Foo
+/td/tr/table
+
+!! end
+
+!! test
[MediaWiki-commits] [Gerrit] Sync parserTests with core. - change (mediawiki...Parsoid)
Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/76864
Change subject: Sync parserTests with core.
..
Sync parserTests with core.
This matches upstream commit e07be1427ba6560fe8b08c720bfed9a2aa87f290.
It contains new parser tests for bug 44498 and bug 49400. These bugs
are not yet fixed, so it also updates the blacklist to account for the
new failures.
Change-Id: Ib5ff2443dd29c85c2aef4a9638385e0ffbfb82cb
---
M js/tests/fetch-parserTests.txt.js
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
3 files changed, 61 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/64/76864/1
diff --git a/js/tests/fetch-parserTests.txt.js
b/js/tests/fetch-parserTests.txt.js
index 1f92ba5..aa6d787 100755
--- a/js/tests/fetch-parserTests.txt.js
+++ b/js/tests/fetch-parserTests.txt.js
@@ -10,9 +10,9 @@
// and update these hashes automatically.
//
// You can use 'sha1sum -b tests/parser/parserTests.txt' to compute this value:
-var expectedSHA1 = dbf294faadb0fca67f9a267e6864d40909581788;
+var expectedSHA1 = d1619d3fe6fc04c2b33a0ecb6c28ae1ee4d28270;
// git log --pretty=oneline -1 tests/parser/parserTests.txt
-var latestCommit = cd9ad736027025a784499807668da50865ec18eb;
+var latestCommit = e07be1427ba6560fe8b08c720bfed9a2aa87f290;
var fs = require('fs'),
path = require('path'),
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index 69e28e2..d19c480 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -62,6 +62,8 @@
add(wt2html, External link containing double-single-quotes in text embedded
in italics (bug 4598 sanity check));
add(wt2html, Non-extlinks in brackets);
add(wt2html, Template-generated table cell attributes and cell content);
+add(wt2html, Template-generated table cell attributes and cell content
(2));
+add(wt2html, Template-generated table cell attributes and cell content
(3));
add(wt2html, Link containing \#\ and \#\ % as a hex sequences- these
are valid section anchors\nExample for such a section: == ==);
add(wt2html, Link containing \#\ and \#\ as a hex sequences);
add(wt2html, Link containing double-single-quotes '' in text embedded in
italics (bug 4598 sanity check));
@@ -199,6 +201,7 @@
add(wt2html, Simple image (using File: namespace, now canonical));
add(wt2html, Image with caption);
add(wt2html, Image with empty attribute);
+add(wt2html, Image with attributes from template.);
add(wt2html, Image with link tails);
add(wt2html, Image with multiple captions -- only last one is accepted);
add(wt2html, Image with width attribute at different positions);
@@ -904,6 +907,7 @@
add(html2html, Simple image (using File: namespace, now canonical));
add(html2html, Image with caption);
add(html2html, Image with empty attribute);
+add(html2html, Image with attributes from template.);
add(html2html, Image with link tails);
add(html2html, Image with multiple captions -- only last one is accepted);
add(html2html, Image with width attribute at different positions);
@@ -1393,6 +1397,8 @@
add(html2wt, Table security: embedded pipes
(http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html));
add(html2wt, Indented table markup mixed with indented pre content
(proposed in bug 6200));
add(html2wt, Template-generated table cell attributes and cell content);
+add(html2wt, Template-generated table cell attributes and cell content
(2));
+add(html2wt, Template-generated table cell attributes and cell content
(3));
add(html2wt, Table with row followed by newlines and table heading);
add(html2wt, Table with empty line following the start tag);
add(html2wt, Table attributes with empty value);
@@ -1679,6 +1685,7 @@
add(html2wt, Simple image (using File: namespace, now canonical));
add(html2wt, Image with caption);
add(html2wt, Image with empty attribute);
+add(html2wt, Image with attributes from template.);
add(html2wt, Image with link tails);
add(html2wt, Image with multiple captions -- only last one is accepted);
add(html2wt, Image with width attribute at different positions);
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index aedbf45..76388d9 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -121,6 +121,19 @@
!! endarticle
!! article
+Template:table_cells
+!! text
+{{table_attribs}} || Bar || Baz
+!! endarticle
+
+!! article
+Template:image_attribs
+!! text
+noinclude
+[[File:foobar.jpg|/noincluderight|Caption textnoinclude]]/noinclude
+!! endarticle
+
+!! article
A?b
!! text
Weirdo titles!
@@ -3851,6 +3864,36 @@
table
tr
td style=color: red Foo
+/td/tr/table
+
+!! end
+
+!! test
+Template-generated table cell attributes and cell content (2)
+!! input
+{|
+|align=center {{table_attribs}}
+|}
+!! result
+table
+tr
+td align=center style=color: red Foo
