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 = "3aa4ff16bbbb8f50d5a9981372ffcbb5b501c13e";
// 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", "Magic Word: {{NAMESPACE}}");
add("wt2html", "Magic Word: {{NAMESPACEE}}");
add("wt2html", "Magic Word: {{NAMESPACENUMBER}}");
+add("wt2html", "Magic Word: {{SUBPAGENAME}}");
+add("wt2html", "Magic Word: {{SUBPAGENAMEE}}");
+add("wt2html", "Magic Word: {{ROOTPAGENAME}}");
+add("wt2html", "Magic Word: {{ROOTPAGENAMEE}}");
+add("wt2html", "Magic Word: {{BASEPAGENAME}}");
+add("wt2html", "Magic Word: {{BASEPAGENAMEE}}");
+add("wt2html", "Magic Word: {{TALKPAGENAME}}");
+add("wt2html", "Magic Word: {{TALKPAGENAMEE}}");
+add("wt2html", "Magic Word: {{SUBJECTPAGENAME}}");
+add("wt2html", "Magic Word: {{SUBJECTPAGENAMEE}}");
add("wt2html", "Magic Word: {{NUMBEROFFILES}}");
add("wt2html", "Magic Word: {{PAGENAME}}");
add("wt2html", "Magic Word: {{PAGENAMEE}}");
add("wt2html", "Magic Word: {{PAGENAMEE}} with metacharacters (bug 26781)");
add("wt2html", "Magic Word: {{REVISIONID}}");
+add("wt2html", "Magic Word: {{STYLEPATH}}");
add("wt2html", "Case-sensitive magic words, when cased differently, should
just be template transclusions");
add("wt2html", "Namespace 1 {{ns:1}}");
add("wt2html", "Namespace 1 {{ns:01}}");
@@ -390,7 +416,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");
@@ -532,6 +557,8 @@
add("wt2wt", "Italics and bold: other quote tests: (3,2,3,3) (parsoid)");
add("wt2wt", "Italicized possessive");
add("wt2wt", "Parsoid only: Quote balancing context should be restricted to
td/th cells on the same wikitext line\n(Requires tidy for PHP parser output to
be fixed up)");
+add("wt2wt", "Non-word characters don't terminate tag names (bug 17663, 40670,
52022)");
+add("wt2wt", "Bare pipe character (bug 52363)");
add("wt2wt", "Comment semantics: unclosed comment at end");
add("wt2wt", "Multiple lines without block tags");
add("wt2wt", "<nowiki> inside <pre> (bug 13238)");
@@ -575,7 +602,21 @@
add("wt2wt", "Nested lists 6 (both elements empty)");
add("wt2wt", "Test the li-hack\n(Cannot test this with PHP parser since it
relies on Tidy for the hack)");
add("wt2wt", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up)");
+add("wt2wt", "Magic Word: {{CURRENTMONTH1}}");
+add("wt2wt", "Magic Words LOCAL (UTC)");
+add("wt2wt", "Magic Word: {{TALKSPACEE}}");
+add("wt2wt", "Magic Word: {{SUBJECTSPACEE}}");
+add("wt2wt", "Magic Word: {{SUBPAGENAME}}");
+add("wt2wt", "Magic Word: {{SUBPAGENAMEE}}");
+add("wt2wt", "Magic Word: {{ROOTPAGENAME}}");
+add("wt2wt", "Magic Word: {{ROOTPAGENAMEE}}");
+add("wt2wt", "Magic Word: {{BASEPAGENAME}}");
+add("wt2wt", "Magic Word: {{BASEPAGENAMEE}}");
+add("wt2wt", "Magic Word: {{TALKPAGENAMEE}}");
+add("wt2wt", "Magic Word: {{SUBJECTPAGENAME}}");
+add("wt2wt", "Magic Word: {{SUBJECTPAGENAMEE}}");
add("wt2wt", "Magic Word: {{REVISIONID}}");
+add("wt2wt", "Magic Word: {{STYLEPATH}}");
add("wt2wt", "Case-sensitive magic words, when cased differently, should just
be template transclusions");
add("wt2wt", "Nonexistent template");
add("wt2wt", "Template with argument in separate line");
@@ -697,6 +738,7 @@
add("html2html", "<nowiki> spacing");
add("html2html", "nowiki 3");
add("html2html", "Preformatted text");
+add("html2html", "Bug 6200: 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)");
@@ -704,6 +746,7 @@
add("html2html", "<nowiki> inside <pre> (bug 13238)");
add("html2html", "Templates: Dont strip whitespace from
whitespace/comment-only arguments");
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");
@@ -814,7 +857,7 @@
add("html2html", "List items are not parsed correctly following a <pre> block
(bug 785)");
add("html2html", "List interrupted by empty line or heading");
add("html2html", "Multiple list tags generated by templates");
-add("html2html", "Single-comment whitespace lines dont break lists, but
multi-comment whitespace lines do");
+add("html2html", "Single-comment whitespace lines dont break lists, and so do
multi-comment whitespace lines");
add("html2html", "Unbalanced closing block tags break a list\n(Parsoid-only
since php parser generates broken html -- relies on Tidy to fix up)");
add("html2html", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up)");
add("html2html", "List embedded in a non-block tag\n(Ugly Parsoid output --
worth fixing; Disabled for PHP parser since it relies on Tidy)");
@@ -1208,6 +1251,10 @@
add("html2wt", "Italics and bold: other quote tests: (3,2,3,2)");
add("html2wt", "Italics and bold: other quote tests: (3,2,3,3) (parsoid)");
add("html2wt", "Italicized possessive");
+add("html2wt", "<wbr> is valid wikitext (bug 52468)");
+add("html2wt", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022)");
+add("html2wt", "Bare pipe character (bug 52363)");
+add("html2wt", "Bare pipe character from a template (bug 52363)");
add("html2wt", "<nowiki> unordered list");
add("html2wt", "<nowiki> spacing");
add("html2wt", "nowiki 3");
@@ -1235,6 +1282,8 @@
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 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 attribute (bug 3202)");
add("html2wt", "<pre> with forbidden attribute (bug 3202)");
@@ -1461,7 +1510,7 @@
add("html2wt", "List items from template");
add("html2wt", "List interrupted by empty line or heading");
add("html2wt", "Multiple list tags generated by templates");
-add("html2wt", "Single-comment whitespace lines dont break lists, but
multi-comment whitespace lines do");
+add("html2wt", "Single-comment whitespace lines dont break lists, and so do
multi-comment whitespace lines");
add("html2wt", "Parsoid: Test of whitespace serialization with Templated
bullets");
add("html2wt", "Unbalanced closing block tags break a list\n(Parsoid-only
since php parser generates broken html -- relies on Tidy to fix up)");
add("html2wt", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up)");
@@ -1472,17 +1521,39 @@
add("html2wt", "Magic Word: {{CURRENTDAYNAME}}");
add("html2wt", "Magic Word: {{CURRENTDOW}}");
add("html2wt", "Magic Word: {{CURRENTMONTH}}");
+add("html2wt", "Magic Word: {{CURRENTMONTH1}}");
add("html2wt", "Magic Word: {{CURRENTMONTHABBREV}}");
add("html2wt", "Magic Word: {{CURRENTMONTHNAME}}");
add("html2wt", "Magic Word: {{CURRENTMONTHNAMEGEN}}");
add("html2wt", "Magic Word: {{CURRENTTIME}}");
+add("html2wt", "Magic Word: {{CURRENTHOUR}}");
add("html2wt", "Magic Word: {{CURRENTWEEK}} (@bug 4594)");
add("html2wt", "Magic Word: {{CURRENTYEAR}}");
+add("html2wt", "Magic Word: {{CURRENTTIMESTAMP}}");
+add("html2wt", "Magic Words LOCAL (UTC)");
add("html2wt", "Magic Word: {{FULLPAGENAME}}");
add("html2wt", "Magic Word: {{FULLPAGENAMEE}}");
+add("html2wt", "Magic Word: {{TALKSPACE}}");
+add("html2wt", "Magic Word: {{TALKSPACE}}, same namespace");
+add("html2wt", "Magic Word: {{TALKSPACE}}, main namespace");
+add("html2wt", "Magic Word: {{TALKSPACEE}}");
+add("html2wt", "Magic Word: {{SUBJECTSPACE}}");
+add("html2wt", "Magic Word: {{SUBJECTSPACE}}, same namespace");
+add("html2wt", "Magic Word: {{SUBJECTSPACE}}, main namespace");
+add("html2wt", "Magic Word: {{SUBJECTSPACEE}}");
add("html2wt", "Magic Word: {{NAMESPACE}}");
add("html2wt", "Magic Word: {{NAMESPACEE}}");
add("html2wt", "Magic Word: {{NAMESPACENUMBER}}");
+add("html2wt", "Magic Word: {{SUBPAGENAME}}");
+add("html2wt", "Magic Word: {{SUBPAGENAMEE}}");
+add("html2wt", "Magic Word: {{ROOTPAGENAME}}");
+add("html2wt", "Magic Word: {{ROOTPAGENAMEE}}");
+add("html2wt", "Magic Word: {{BASEPAGENAME}}");
+add("html2wt", "Magic Word: {{BASEPAGENAMEE}}");
+add("html2wt", "Magic Word: {{TALKPAGENAME}}");
+add("html2wt", "Magic Word: {{TALKPAGENAMEE}}");
+add("html2wt", "Magic Word: {{SUBJECTPAGENAME}}");
+add("html2wt", "Magic Word: {{SUBJECTPAGENAMEE}}");
add("html2wt", "Magic Word: {{NUMBEROFFILES}}");
add("html2wt", "Magic Word: {{PAGENAME}}");
add("html2wt", "Magic Word: {{PAGENAME}} with metacharacters");
@@ -1491,6 +1562,7 @@
add("html2wt", "Magic Word: {{PAGENAMEE}} with metacharacters (bug 26781)");
add("html2wt", "Magic Word: {{REVISIONID}}");
add("html2wt", "Magic Word: {{SCRIPTPATH}}");
+add("html2wt", "Magic Word: {{STYLEPATH}}");
add("html2wt", "Magic Word: {{SERVER}}");
add("html2wt", "Magic Word: {{SERVERNAME}}");
add("html2wt", "Magic Word: {{SITENAME}}");
@@ -2117,11 +2189,9 @@
// Blacklist for selser
add("selser", "Paragraphs with extra newline spacing
[[2],0,1,0,2,0,[3],0,3,[3]]");
-add("selser", "Paragraphs with newline spacing with comment lines in between
[3,0,3,0,0,0,[4],4,3,2,4,0,0,0,0,1,4,0,0,2,2,4,0,4,3,0,2,4,0,2,0,[4],0,0,0,2,0,3,0,0,2,3,3,0]");
-add("selser", "Paragraphs with newline spacing with comment lines in between
[0,2,[4,2,3],4,3,2,0,0,2,4,4,2,0,0,4,3,0,4,0,0,0,4,4,2,2,0,2,0,4,1,0,[4],0,4,3,3,4,4,0,0,3,2,3,0]");
-add("selser", "Paragraphs with newline spacing with comment lines in between
[0,0,2,0,0,3,0,0,0,0,0,4,0,0,4,[2],0,0,0,2,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,[2,0],3,0,3,0,4,2,3,3]");
-add("selser", "Paragraphs with newline spacing with comment lines in between
[1,0,[2,0,0],4,2,4,0,3,0,0,4,[3],3,2,0,1,0,3,0,2,0,0,4,2,4,2,0,[3],2,4,2,0,2,4,0,2,0,1,4,4,0,[0,4,2,0],4,0]");
-add("selser", "Paragraphs with newline spacing with comment lines in between
[0,0,[3,0,2],0,0,0,0,0,3,2,3,[3],4,0,4,3,3,2,3,[4],0,0,3,0,3,0,2,4,0,0,0,[3],0,3,3,2,3,0,0,[3],0,0,0,3]");
+add("selser", "Paragraphs with newline spacing with comment lines in between
[4,3,3,0,3,2,0,4,0,0,0,0,0,2,0,1,0,0,0,0,2,3,0,4,0,3,0,[2],0,2,0,[3],0,0,0,2,0,0,0,0,3,1,0,2,2,4,2,2,2,1,3,[3],4,4,2,0]");
+add("selser", "Paragraphs with newline spacing with comment lines in between
[0,0,3,2,0,2,1,0,0,0,4,4,2,2,0,1,0,4,0,4,2,0,3,3,4,3,3,1,0,0,2,1,0,0,4,3,0,0,3,0,0,3,0,0,0,0,3,4,0,4,0,0,0,2,3,0]");
+add("selser", "Paragraphs with newline spacing with comment lines in between
[0,0,[3,0,0],2,0,2,2,2,3,0,4,[2],3,2,2,1,3,2,0,2,2,0,3,[3],3,3,2,[4],2,3,0,[4],0,3,2,3,0,0,3,0,0,3,3,0,0,0,0,2,0,0,0,4,4,[3,0,4,3],4,0]");
add("selser", "Paragraphs with newline spacing with non-empty white-space
lines in between [0,3,[4],3,0,3,0,3,2,0,2,3,0]");
add("selser", "Paragraphs with newline spacing with non-empty white-space
lines in between [0,2,3,0,[3],0,0,0,4,0,[0,4],4,4]");
add("selser", "Paragraphs with newline spacing with non-empty white-space
lines in between [3,2,4,4,0,0,0,4,[4],0,2,3,2]");
@@ -2352,6 +2422,26 @@
add("selser", "Parsoid only: Quote balancing context should be restricted to
td/th cells on the same wikitext line\n(Requires tidy for PHP parser output to
be fixed up) [[0,[1,4]]]");
add("selser", "Parsoid only: Quote balancing context should be restricted to
td/th cells on the same wikitext line\n(Requires tidy for PHP parser output to
be fixed up) [[3,[2,4]]]");
add("selser", "Parsoid only: Quote balancing context should be restricted to
td/th cells on the same wikitext line\n(Requires tidy for PHP parser output to
be fixed up) [[4,1]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[4],0,0,0,2,0,[4],0,[2],2,0]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [4,0,0,2,[3],2,0,0,0,0,0]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [4,0,4,0,2,2,[3],0,1,0,[4]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,3,4,0,0,0,[3],0,1,3,1]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [1,0,[4],4,[3],4,0,4,0,4,0]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[3],3,[3],3,4,3,4,4,4,2,3]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,0,[3],0,0,4,1,0,3,0,4]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,0,4,0,0,0,1,0,0,0,[3]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [3,0,[2],4,1,2,0,3,0,3,[4]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[4],0,0,0,[2],0,[2],0,0,4,1]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [4,2,3,0,1,2,2,3,[2],3,2]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [1,0,3,2,3,4,[4],0,2,3,[4]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,2,0,0,[3],2,1,0,1,0,3]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [2,0,[3],4,[4],4,[2],4,4,0,2]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [3,0,2,0,1,2,3,3,0,0,[4]]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,4,4,4,1,2,3,0,0,4,1]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[3],0,2,0,3,0,[4],0,[4],2,2]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[4],0,[2],2,3,3,1,0,0,0,4]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [0,2,3,0,[3],2,2,0,0,2,1]");
+add("selser", "Non-word characters don't terminate tag names (bug 17663,
40670, 52022) [[2],3,3,0,4,2,0,3,0,0,2]");
add("selser", "Comment semantics: unclosed comment at end [3]");
add("selser", "Comment semantics: unclosed comment at end [4]");
add("selser", "Comment semantics: unclosed comment at end [2]");
@@ -3031,9 +3121,59 @@
add("selser", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up) [1,0,2]");
add("selser", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up) [0,0,[4,3,[4]]]");
add("selser", "Unbalanced closing non-block tags don't break a
list\n(Parsoid-only since php parser generates broken html -- relies on Tidy to
fix up) [0,3,1]");
+add("selser", "Magic Word: {{CURRENTMONTH1}} [[4]]");
+add("selser", "Magic Word: {{CURRENTMONTH1}} [[2]]");
+add("selser", "Magic Word: {{CURRENTMONTH1}} [[3]]");
+add("selser", "Magic Words LOCAL (UTC) [1]");
+add("selser", "Magic Words LOCAL (UTC)
[[1,3,0,3,0,0,[2,0],0,0,2,[4,0],0,0,0,4,0,[3,0],0,[2,0],0,0,4,2,0,1,2,0]]");
+add("selser", "Magic Words LOCAL (UTC)
[[4,0,0,0,0,0,4,4,0,3,[4,0],2,0,3,2,0,4,0,0,0,0,0,0,0,2,4,3]]");
+add("selser", "Magic Words LOCAL (UTC)
[[1,0,0,4,1,4,[3,0],0,1,3,[2,0],3,2,0,0,0,0,0,0,2,[3,0],0,4,0,0,0,1]]");
+add("selser", "Magic Words LOCAL (UTC)
[[1,2,0,0,3,0,0,0,3,3,[3,0],2,3,2,2,0,[2,0],3,3,0,0,2,0,0,3,3,2]]");
+add("selser", "Magic Words LOCAL (UTC) [2]");
+add("selser", "Magic Words LOCAL (UTC)
[[[4,0],4,[2],0,[4,0],4,4,0,1,4,2,0,1,3,3,4,1,0,[3,0],0,0,4,[3,0],4,2,0,0]]");
+add("selser", "Magic Words LOCAL (UTC)
[[0,0,[3],4,2,0,[3,0],0,3,0,2,0,0,0,[3,0],0,4,3,[3,0],0,0,2,0,4,2,0,[2,0]]]");
+add("selser", "Magic Words LOCAL (UTC)
[[1,0,0,4,4,0,4,4,[4,0],4,0,0,0,0,4,0,1,3,4,2,[3,0],2,3,0,[2,0],0,[2,0]]]");
+add("selser", "Magic Words LOCAL (UTC)
[[2,0,[4],3,2,3,[2,0],2,[3,0],0,[3,0],0,2,0,4,0,1,0,0,0,2,0,0,0,4,0,[4,0]]]");
+add("selser", "Magic Words LOCAL (UTC)
[[0,0,0,0,4,2,[4,0],0,1,2,[4,0],0,1,2,0,3,1,3,4,0,3,3,2,0,0,2,[3,0]]]");
+add("selser", "Magic Word: {{TALKSPACEE}} [[4]]");
+add("selser", "Magic Word: {{TALKSPACEE}} [[3]]");
+add("selser", "Magic Word: {{TALKSPACEE}} [[2]]");
+add("selser", "Magic Word: {{SUBJECTSPACEE}} [[2]]");
+add("selser", "Magic Word: {{SUBJECTSPACEE}} [[4]]");
+add("selser", "Magic Word: {{SUBJECTSPACEE}} [[3]]");
+add("selser", "Magic Word: {{SUBPAGENAME}} [[2]]");
+add("selser", "Magic Word: {{SUBPAGENAME}} [[3]]");
+add("selser", "Magic Word: {{SUBPAGENAME}} [[4]]");
+add("selser", "Magic Word: {{SUBPAGENAMEE}} [[3]]");
+add("selser", "Magic Word: {{SUBPAGENAMEE}} [[2]]");
+add("selser", "Magic Word: {{SUBPAGENAMEE}} [[4]]");
+add("selser", "Magic Word: {{ROOTPAGENAME}} [[2]]");
+add("selser", "Magic Word: {{ROOTPAGENAME}} [[3]]");
+add("selser", "Magic Word: {{ROOTPAGENAME}} [[4]]");
+add("selser", "Magic Word: {{ROOTPAGENAMEE}} [[3]]");
+add("selser", "Magic Word: {{ROOTPAGENAMEE}} [[2]]");
+add("selser", "Magic Word: {{ROOTPAGENAMEE}} [[4]]");
+add("selser", "Magic Word: {{BASEPAGENAME}} [[3]]");
+add("selser", "Magic Word: {{BASEPAGENAME}} [[4]]");
+add("selser", "Magic Word: {{BASEPAGENAME}} [[2]]");
+add("selser", "Magic Word: {{BASEPAGENAMEE}} [[2]]");
+add("selser", "Magic Word: {{BASEPAGENAMEE}} [[3]]");
+add("selser", "Magic Word: {{BASEPAGENAMEE}} [[4]]");
+add("selser", "Magic Word: {{TALKPAGENAMEE}} [[4]]");
+add("selser", "Magic Word: {{TALKPAGENAMEE}} [[2]]");
+add("selser", "Magic Word: {{TALKPAGENAMEE}} [[3]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAME}} [[4]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAME}} [[3]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAME}} [[2]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAMEE}} [[2]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAMEE}} [[3]]");
+add("selser", "Magic Word: {{SUBJECTPAGENAMEE}} [[4]]");
add("selser", "Magic Word: {{REVISIONID}} [[3]]");
add("selser", "Magic Word: {{REVISIONID}} [[2]]");
add("selser", "Magic Word: {{REVISIONID}} [[4]]");
+add("selser", "Magic Word: {{STYLEPATH}} [[3]]");
+add("selser", "Magic Word: {{STYLEPATH}} [[4]]");
+add("selser", "Magic Word: {{STYLEPATH}} [[2]]");
add("selser", "Case-sensitive magic words, when cased differently, should just
be template transclusions [[4]]");
add("selser", "Case-sensitive magic words, when cased differently, should just
be template transclusions [[3]]");
add("selser", "Case-sensitive magic words, when cased differently, should just
be template transclusions [[2]]");
@@ -3413,24 +3553,24 @@
add("selser", "5 quotes, code coverage +1 line (parsoid) [[[3]]]");
add("selser", "5 quotes, code coverage +1 line (parsoid) [[[2]]]");
add("selser", "5 quotes, code coverage +1 line (parsoid) [[2]]");
-add("selser", "Say the magic word
[[0,0,4,0,[4],0,0,0,3,4,1,0,[3],3,0,3,[3,0],4,1,4,0,0,[4],0,4,4,0,0,1,0,[3],2,[4,0],0,[3],0,3]]");
-add("selser", "Say the magic word
[[0,0,[3],3,[3],0,[2],0,[4],4,3,3,0,0,[3],0,0,4,[3],2,2,4,3,2,0,3,0,0,[4,0],3,[3],3,1,4,4,3,2]]");
+add("selser", "Say the magic word
[[0,0,4,0,[4,0],0,0,0,3,4,1,0,[3],3,0,3,[3],4,1,4,0,0,[4],0,4,4,0,0,1,0,[3,0],2,[4,0],0,[3,0],0,3,0,4,3,1,0,1]]");
+add("selser", "Say the magic word
[[0,0,[3,0],3,[3,0],0,[2,0],0,[4],4,3,3,0,0,[3],0,0,4,[3],2,2,4,3,2,0,3,0,0,[4,0],3,[3,0],3,1,4,4,3,2,2,[4,0],2,[2],3,0]]");
add("selser", "Say the magic word [2]");
add("selser", "Say the magic word [1]");
-add("selser", "Say the magic word
[[[2,0],4,0,0,[4],4,1,3,0,0,1,0,2,3,1,3,4,0,1,4,3,4,[2],0,3,0,3,3,[4,0],0,0,4,3,2,0,0,[2]]]");
-add("selser", "Say the magic word
[[[2,0],0,2,3,[3],4,2,0,0,4,3,0,0,2,[4],0,0,0,0,2,3,4,[4],0,3,0,0,3,2,2,3,0,1,4,3,3,4]]");
-add("selser", "Say the magic word
[[2,2,0,4,[2],0,[2],0,0,3,4,0,3,3,0,0,0,0,4,2,0,0,[3],4,4,3,[4,0],3,1,0,[3],0,[3,0],2,[2],2,[4]]]");
-add("selser", "Say the magic word
[[1,2,0,0,0,4,0,4,0,3,0,4,0,2,2,0,1,3,1,4,[4],3,[2],3,0,0,3,0,[2,0],0,4,0,[4,0],0,0,0,2]]");
-add("selser", "Say the magic word
[[[4,0],4,4,0,0,0,3,2,[4],2,0,2,0,0,[2],0,2,4,4,3,0,0,[4],0,0,0,1,2,[4,0],0,[3],0,[3,0],2,[3],2,[4]]]");
-add("selser", "Say the magic word
[[[3,0],3,3,0,[2],2,0,0,[3],3,0,0,4,2,2,4,0,0,4,4,[2],0,4,3,[3,0],2,4,2,0,0,4,0,1,0,0,0,4]]");
-add("selser", "Say the magic word
[[3,2,1,0,0,2,0,4,[2],2,4,2,4,2,3,4,0,3,0,4,[3],2,0,0,3,4,3,4,[2,0],0,4,3,2,4,0,0,0]]");
-add("selser", "Say the magic word
[[0,0,0,0,[2],0,[3],0,2,4,1,0,0,2,4,0,0,0,2,0,0,0,0,0,[4,0],0,4,2,3,0,2,3,0,2,2,0,0]]");
-add("selser", "Say the magic word
[[[3,0],0,3,3,[4],2,4,0,[2],3,[3],2,2,0,3,0,[2,0],0,3,0,3,0,1,4,3,0,0,0,[2,0],0,1,3,0,4,3,0,0]]");
-add("selser", "Say the magic word
[[2,0,[2],2,1,0,0,0,4,3,0,2,1,4,2,0,[4,0],0,2,3,3,3,0,0,2,3,4,0,2,3,3,0,0,3,2,2,[3]]]");
-add("selser", "Say the magic word
[[4,3,2,0,[4],0,0,0,3,2,0,2,1,2,4,2,[4,0],0,4,2,0,4,[2],0,0,3,[4,0],3,0,4,3,2,3,2,[3],0,1]]");
-add("selser", "Say the magic word
[[[3,0],4,2,0,[2],3,0,3,0,0,3,2,[2],0,[2],0,[2,0],4,[3],3,0,3,2,0,2,4,0,2,[3,0],0,1,2,[4,0],0,[3],0,1]]");
-add("selser", "Say the magic word
[[0,0,[2],2,0,0,[3],0,0,0,2,3,4,0,3,3,[4,0],0,2,3,4,3,3,3,3,0,0,4,[3,0],3,4,0,[3,0],0,4,0,2]]");
-add("selser", "Say the magic word
[[3,0,1,0,[3],4,[4],0,3,4,1,3,1,0,0,0,0,0,3,0,3,4,3,0,1,0,0,4,[2,0],4,4,0,2,0,4,2,[3]]]");
+add("selser", "Say the magic word
[[[2,0],4,0,0,[4,0],4,1,3,0,0,1,0,2,3,1,3,4,0,1,4,3,4,[2],0,3,0,3,3,[4,0],0,0,4,3,2,0,0,[2],0,2,4,2,2,0]]");
+add("selser", "Say the magic word
[[[2,0],0,2,3,[3,0],4,2,0,0,4,3,0,0,2,[4],0,0,0,0,2,3,4,[4],0,3,0,0,3,2,2,3,0,1,4,3,3,4,2,0,3,4,4,3]]");
+add("selser", "Say the magic word
[[2,2,0,4,[2,0],0,[2,0],0,0,3,4,0,3,3,0,0,0,0,4,2,0,0,[3],4,4,3,[4],3,1,0,[3,0],0,[3,0],2,[2,0],2,[4],4,1,3,0,0,[4]]]");
+add("selser", "Say the magic word
[[1,2,0,0,0,4,0,4,0,3,0,4,0,2,2,0,1,3,1,4,[4,0],3,[2],3,0,0,3,0,[2,0],0,4,0,[4,0],0,0,0,2,2,0,0,0,4,0]]");
+add("selser", "Say the magic word
[[[4,0],4,4,0,0,0,3,2,[4],2,0,2,0,0,[2],0,2,4,4,3,0,0,[4],0,0,0,1,2,[4,0],0,[3,0],0,[3,0],2,[3,0],2,[4],0,0,0,3,4,[4]]]");
+add("selser", "Say the magic word
[[[3,0],3,3,0,[2,0],2,0,0,[3],3,0,0,4,2,2,4,0,0,4,4,[2,0],0,4,3,[3],2,4,2,0,0,4,0,1,0,0,0,4,0,3,0,0,3,1]]");
+add("selser", "Say the magic word
[[3,2,1,0,0,2,0,4,[2],2,4,2,4,2,3,4,0,3,0,4,[3,0],2,0,0,3,4,3,4,[2,0],0,4,3,2,4,0,0,0,4,1,0,[2],2,[3]]]");
+add("selser", "Say the magic word
[[0,0,0,0,[2,0],0,[3,0],0,2,4,1,0,0,2,4,0,0,0,2,0,0,0,0,0,[4],0,4,2,3,0,2,3,0,2,2,0,0,2,[4,0],3,1,3,3]]");
+add("selser", "Say the magic word
[[[3,0],0,3,3,[4,0],2,4,0,[2],3,[3],2,2,0,3,0,[2],0,3,0,3,0,1,4,3,0,0,0,[2,0],0,1,3,0,4,3,0,0,0,3,2,4,4,4]]");
+add("selser", "Say the magic word
[[2,0,[2,0],2,1,0,0,0,4,3,0,2,1,4,2,0,[4],0,2,3,3,3,0,0,2,3,4,0,2,3,3,0,0,3,2,2,[3],2,[3,0],3,0,0,1]]");
+add("selser", "Say the magic word
[[4,3,2,0,[4,0],0,0,0,3,2,0,2,1,2,4,2,[4],0,4,2,0,4,[2],0,0,3,[4],3,0,4,3,2,3,2,[3,0],0,1,0,2,0,0,0,0]]");
+add("selser", "Say the magic word
[[[3,0],4,2,0,[2,0],3,0,3,0,0,3,2,[2],0,[2],0,[2],4,[3],3,0,3,2,0,2,4,0,2,[3,0],0,1,2,[4,0],0,[3,0],0,1,2,0,0,4,0,0]]");
+add("selser", "Say the magic word
[[0,0,[2,0],2,0,0,[3,0],0,0,0,2,3,4,0,3,3,[4],0,2,3,4,3,3,3,3,0,0,4,[3,0],3,4,0,[3,0],0,4,0,2,0,1,0,3,0,2]]");
+add("selser", "Say the magic word
[[3,0,1,0,[3,0],4,[4,0],0,3,4,1,3,1,0,0,0,0,0,3,0,3,4,3,0,1,0,0,4,[2,0],4,4,0,2,0,4,2,[3],0,3,2,[3],3,[2]]]");
add("selser", "ISBN code coverage [2]");
add("selser", "ISBN code coverage [[[3],2,0]]");
add("selser", "ISBN code coverage [1]");
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 />
<p>a
-</p><p>b
+b
+</p>
+<hr />
+<p>a
+b
</p>
<hr />
<p>a
@@ -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 />
<p>a
-</p><p>b
+b
</p>
<hr />
<p>a
@@ -871,6 +879,74 @@
</p>
!! end
+!! test
+<wbr> is valid wikitext (bug 52468)
+!! input
+<wbr>
+!! result
+<p><wbr />
+</p>
+!! end
+
+# <strike> is HTML4, <s> is HTML4/5.
+!! test
+<s> or <strike> for strikethrough
+!! input
+<strike>strike</strike>
+
+<s>s</s>
+!! result
+<p><strike>strike</strike>
+</p><p><s>s</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.foo>foo</s>
+
+<s.foo>s.foo</s.foo>
+
+<sub-ID#1>
+!! result
+<p><b→> doesn't work! </b>
+</p><p><bä> doesn't work! </b>
+</p><p><boo> works fine </b>
+</p><p><s.foo>foo</s>
+</p><p><s.foo>s.foo</s.foo>
+</p><p><sub-ID#1>
+</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
+<pre>Blah
+</pre>
+</blockquote>
+
+!! end
+
+!! test
+Bug 51086: Double newlines in blockquotes should be turned into paragraphs
+!! input
+<blockquote>
+Foo
+
+Bar
+</blockquote>
+!! result
+<blockquote>
+<p>Foo
+</p><p>Bar
+</p>
+</blockquote>
+
+!! end
+
+!! test
+Bug 15491: <ins>/<del> in blockquote
+!! input
+<blockquote>
+Foo <del>bar</del> <ins>baz</ins> quux
+</blockquote>
+!! result
+<blockquote>
+<p>Foo <del>bar</del> <ins>baz</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
+<blockquote>Foo <del>bar</del> <ins>baz</ins> quux
+</blockquote>
+!! result
+<blockquote>Foo <del>bar</del> <ins>baz</ins> quux
</blockquote>
!! end
@@ -1801,7 +1921,8 @@
</pre>
</center>
<blockquote>
- foo
+<pre>foo
+</pre>
</blockquote>
<table><tr><td>
<pre>foo
@@ -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
<ul><li>a
</li><li>b
</li><li>c
-</li></ul>
-<ul><li>d
+</li><li>d
</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 +5768,15 @@
!! end
!! test
+Magic Word: {{CURRENTMONTH1}}
+!! input
+{{CURRENTMONTH1}}
+!! result
+<p>1
+</p>
+!! end
+
+!! test
Magic Word: {{CURRENTMONTHABBREV}}
!! input
{{CURRENTMONTHABBREV}}
@@ -5679,6 +5813,15 @@
!! end
!! test
+Magic Word: {{CURRENTHOUR}}
+!! input
+{{CURRENTHOUR}}
+!! result
+<p>00
+</p>
+!! end
+
+!! test
Magic Word: {{CURRENTWEEK}} (@bug 4594)
!! input
{{CURRENTWEEK}}
@@ -5694,6 +5837,51 @@
!! result
<p>1970
</p>
+!! end
+
+!! test
+Magic Word: {{CURRENTTIMESTAMP}}
+!! input
+{{CURRENTTIMESTAMP}}
+!! result
+<p>19700101000203
+</p>
+!! end
+
+!! test
+Magic Words LOCAL (UTC)
+!! input
+* {{LOCALMONTH}}
+* {{LOCALMONTH1}}
+* {{LOCALMONTHNAME}}
+* {{LOCALMONTHNAMEGEN}}
+* {{LOCALMONTHABBREV}}
+* {{LOCALDAY}}
+* {{LOCALDAY2}}
+* {{LOCALDAYNAME}}
+* {{LOCALYEAR}}
+* {{LOCALTIME}}
+* {{LOCALHOUR}}
+* {{LOCALWEEK}}
+* {{LOCALDOW}}
+* {{LOCALTIMESTAMP}}
+!! result
+<ul><li> 01
+</li><li> 1
+</li><li> January
+</li><li> January
+</li><li> Jan
+</li><li> 1
+</li><li> 01
+</li><li> Thursday
+</li><li> 1970
+</li><li> 00:02
+</li><li> 00
+</li><li> 1
+</li><li> 4
+</li><li> 19700101000203
+</li></ul>
+
!! end
!! test
@@ -5715,6 +5903,93 @@
{{FULLPAGENAMEE}}
!! result
<p>User:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKSPACE}}
+!! options
+title=[[User:Ævar Arnfjörð Bjarmason]]
+!! input
+{{TALKSPACE}}
+!! result
+<p>User talk
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKSPACE}}, same namespace
+!! options
+title=[[User talk:Ævar Arnfjörð Bjarmason]]
+!! input
+{{TALKSPACE}}
+!! result
+<p>User talk
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKSPACE}}, main namespace
+!! options
+title=[[Parser Test]]
+!! input
+{{TALKSPACE}}
+!! result
+<p>Talk
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKSPACEE}}
+!! options
+title=[[User:Ævar Arnfjörð Bjarmason]]
+!! input
+{{TALKSPACEE}}
+!! result
+<p>User_talk
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBJECTSPACE}}
+!! options
+title=[[User talk:Ævar Arnfjörð Bjarmason]]
+!! input
+{{SUBJECTSPACE}}
+!! result
+<p>User
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBJECTSPACE}}, same namespace
+!! options
+title=[[User:Ævar Arnfjörð Bjarmason]]
+!! input
+{{SUBJECTSPACE}}
+!! result
+<p>User
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBJECTSPACE}}, main namespace
+!! options
+title=[[Parser Test]]
+!! input
+{{SUBJECTSPACE}}
+!! result
+
+!! end
+
+!! test
+Magic Word: {{SUBJECTSPACEE}}
+!! options
+title=[[User talk:Ævar Arnfjörð Bjarmason]]
+!! input
+{{SUBJECTSPACEE}}
+!! result
+<p>User
</p>
!! end
@@ -5748,6 +6023,116 @@
{{NAMESPACENUMBER}}
!! result
<p>2
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBPAGENAME}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub ö]] subpage
+!! input
+{{SUBPAGENAME}}
+!! result
+<p>sub ö
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBPAGENAMEE}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub ö]] subpage
+!! input
+{{SUBPAGENAMEE}}
+!! result
+<p>sub_%C3%B6
+</p>
+!! end
+
+!! test
+Magic Word: {{ROOTPAGENAME}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub/sub2]] subpage
+!! input
+{{ROOTPAGENAME}}
+!! result
+<p>Ævar Arnfjörð Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{ROOTPAGENAMEE}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub/sub2]] subpage
+!! input
+{{ROOTPAGENAMEE}}
+!! result
+<p>%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{BASEPAGENAME}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub]] subpage
+!! input
+{{BASEPAGENAME}}
+!! result
+<p>Ævar Arnfjörð Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{BASEPAGENAMEE}}
+!! options
+title=[[Ævar Arnfjörð Bjarmason/sub]] subpage
+!! input
+{{BASEPAGENAMEE}}
+!! result
+<p>%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKPAGENAME}}
+!! options
+title=[[User:Ævar Arnfjörð Bjarmason]]
+!! input
+{{TALKPAGENAME}}
+!! result
+<p>User talk:Ævar Arnfjörð Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{TALKPAGENAMEE}}
+!! options
+title=[[User:Ævar Arnfjörð Bjarmason]]
+!! input
+{{TALKPAGENAMEE}}
+!! result
+<p>User_talk:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBJECTPAGENAME}}
+!! options
+title=[[User talk:Ævar Arnfjörð Bjarmason]]
+!! input
+{{SUBJECTPAGENAME}}
+!! result
+<p>User:Ævar Arnfjörð Bjarmason
+</p>
+!! end
+
+!! test
+Magic Word: {{SUBJECTPAGENAMEE}}
+!! options
+title=[[User talk:Ævar Arnfjörð Bjarmason]]
+!! input
+{{SUBJECTPAGENAMEE}}
+!! result
+<p>User:%C3%86var_Arnfj%C3%B6r%C3%B0_Bjarmason
</p>
!! end
@@ -5830,6 +6215,15 @@
{{SCRIPTPATH}}
!! result
<p>/
+</p>
+!! end
+
+!! test
+Magic Word: {{STYLEPATH}}
+!! input
+{{STYLEPATH}}
+!! result
+<p>/skins
</p>
!! end
@@ -10531,7 +10925,7 @@
!! end
###
-### Parser hooks (see maintenance/parserTestsParserHook.php for the <tag>
extension)
+### Parser hooks (see tests/parser/parserTestsParserHook.php for the <tag>
extension)
###
!! test
Parser hook: empty input
@@ -10696,7 +11090,7 @@
!! end
###
-### (see maintenance/parserTestsStaticParserHook.php for the <statictag>
extension)
+### (see tests/parser/parserTestsParserHook.php for the <statictag> extension)
###
!! test
@@ -12330,21 +12724,26 @@
!! test
Say the magic word
+!! options
+title=[[Parser test]]
!! input
* {{PAGENAME}}
+* {{PAGENAMEE}}
+* {{FULLPAGENAME}}
+* {{FULLPAGENAMEE}}
* {{BASEPAGENAME}}
+* {{BASEPAGENAMEE}}
* {{SUBPAGENAME}}
* {{SUBPAGENAMEE}}
* {{ROOTPAGENAME}}
* {{ROOTPAGENAMEE}}
-* {{BASEPAGENAME}}
-* {{BASEPAGENAMEE}}
* {{TALKPAGENAME}}
* {{TALKPAGENAMEE}}
* {{SUBJECTPAGENAME}}
* {{SUBJECTPAGENAMEE}}
* {{NAMESPACEE}}
* {{NAMESPACE}}
+* {{NAMESPACENUMBER}}
* {{TALKSPACE}}
* {{TALKSPACEE}}
* {{SUBJECTSPACE}}
@@ -12352,7 +12751,9 @@
*
{{Dynamic|{{NUMBEROFUSERS}}|{{NUMBEROFPAGES}}|{{CURRENTVERSION}}|{{CONTENTLANGUAGE}}|{{DIRECTIONMARK}}|{{CURRENTTIMESTAMP}}|{{NUMBEROFARTICLES}}}}
!! result
<ul><li> Parser test
+</li><li> Parser_test
</li><li> Parser test
+</li><li> Parser_test
</li><li> Parser test
</li><li> Parser_test
</li><li> Parser test
@@ -12365,6 +12766,7 @@
</li><li> Parser_test
</li><li>
</li><li>
+</li><li> 0
</li><li> Talk
</li><li> Talk
</li><li>
@@ -13121,9 +13523,6 @@
</p>
!! end
-# Expected output in the following test is not necessarily expected (there
-# should probably be <p> tags inside the <blockquote> in the output) -- it's
-# only testing for well-formedness.
!! test
Bug 6200: blockquotes and paragraph formatting
!! input
@@ -13136,7 +13535,8 @@
baz
!! result
<blockquote>
-foo
+<p>foo
+</p>
</blockquote>
<p>bar
</p>
@@ -13816,8 +14216,6 @@
# Bug 6200: <blockquote> should behave like <div> with respect to line breaks
!! test
Bug 6200: paragraphs inside blockquotes (no extra line breaks)
-!! options
-disabled
!! input
<blockquote>Line one
@@ -13830,8 +14228,6 @@
!! test
Bug 6200: paragraphs inside blockquotes (extra line break on open)
-!! options
-disabled
!! input
<blockquote>
Line one
@@ -13847,8 +14243,6 @@
!! test
Bug 6200: paragraphs inside blockquotes (extra line break on close)
-!! options
-disabled
!! input
<blockquote>Line one
@@ -13864,8 +14258,6 @@
!! test
Bug 6200: paragraphs inside blockquotes (extra line break on open and close)
-!! options
-disabled
!! input
<blockquote>
Line one
@@ -16399,12 +16791,10 @@
!! end
-# This fails in the PHP parser (see bug 40670,
-# https://bugzilla.wikimedia.org/show_bug.cgi?id=40670), so disabled for it.
+# This was a bug in the PHP parser (see bug 17663 and its dups,
+# https://bugzilla.wikimedia.org/show_bug.cgi?id=17663)
!! test
Tag names followed by punctuation should not be recognized as tags
-!! options
-parsoid
!! input
<s.ome> text
!! result
--
To view, visit https://gerrit.wikimedia.org/r/78833
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a06fbce0858507ac86e1832e7cf3456cfda1da4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
