jenkins-bot has submitted this change and it was merged.
Change subject: Fix up two parser tests which don't pass in the PHP parser.
......................................................................
Fix up two parser tests which don't pass in the PHP parser.
The parser tests "1d. Indent-Pre and Comments" and "6. Pre-blocks
should extend across lines with leading WS" were both failing in the
PHP parser. Tweak them to match the PHP parser output. This has the
benefit of getting parsoid to pass one of them!
Change-Id: Id6b7daa2b1b8a7d507305cbbf5d00c71ce7ac54a
---
M js/tests/parserTests-blacklist.js
M js/tests/parserTests.txt
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/tests/parserTests-blacklist.js
b/js/tests/parserTests-blacklist.js
index e75571d..84b3aa8 100644
--- a/js/tests/parserTests-blacklist.js
+++ b/js/tests/parserTests-blacklist.js
@@ -49,7 +49,6 @@
add("wt2html", "Templates: Indent-Pre: 1f: Wrapping should be based on
expanded content");
add("wt2html", "Templates: Strip whitespace from named parameters, but not
positional ones");
add("wt2html", "Templates: Dont strip whitespace from whitespace/comment-only
arguments");
-add("wt2html", "1d. Indent-Pre and Comments\n(Pre-handler currently cannot
distinguish between comment/ws order and normalizes them to [comment,ws]
order)");
add("wt2html", "2a. Indent-Pre and tables");
add("wt2html", "2b. Indent-Pre and tables");
add("wt2html", "2c. Indent-Pre and tables (bug 42252)");
diff --git a/js/tests/parserTests.txt b/js/tests/parserTests.txt
index e385fa2..e36d82e 100644
--- a/js/tests/parserTests.txt
+++ b/js/tests/parserTests.txt
@@ -1682,9 +1682,9 @@
<!--b-->b
!!result
-<pre> b
+<pre>a
</pre>
-<pre> b
+<pre>b
</pre>
!!end
@@ -1853,7 +1853,7 @@
d
!! result
<pre>a
-
+
b
</pre>
<pre>c
@@ -1861,7 +1861,6 @@
</pre>
<p>d
</p>
-
!! end
###
--
To view, visit https://gerrit.wikimedia.org/r/77780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6b7daa2b1b8a7d507305cbbf5d00c71ce7ac54a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: 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
