Cscott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/232787

Change subject: parserTests: Get rid of an html2wt failure by adding an 
html/parsoid clause
......................................................................

parserTests: Get rid of an html2wt failure by adding an html/parsoid clause

Change-Id: Id4bad7f699440f3d3a85d40b333fedbc7493f93a
---
M tests/parserTests-blacklist.js
M tests/parserTests.txt
2 files changed, 15 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid 
refs/changes/87/232787/1

diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 14c64cc..1575237 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -810,7 +810,6 @@
 add("html2wt", "External link containing double-single-quotes with no space 
separating the url from text in italics", 
"[http://www.musee-picasso.fr/pages/page_id18528_u1l2.htm ''La muerte de 
Casagemas'' (1901) en el sitio de ][[Museo Picasso (ParĂ­s)|Museo 
Picasso]]<span>.</span>\n");
 add("html2wt", "URL-encoding in URL functions (single parameter)", 
"/index.php?title=Some_page&amp=&\n");
 add("html2wt", "URL-encoding in URL functions (multiple parameters)", 
"/index.php?title=Some_page&q=?&amp=&\n");
-add("html2wt", "Non-extlinks in brackets", "[foo]\n[foo bar]\n[foo 
''bar'']\n[fool's] errand\n[fool's errand]\n[foo]\n[foo bar]\n[foo 
''bar'']\n[fool's] errand\n[fool's 
errand]\n[url=foo]\n[url=http://example.com]\n[http:// bare protocols don't 
count]\n");
 add("html2wt", "Unclosed and unmatched quotes", "'''''Bold italic text '''with 
bold deactivated''' in between.'''''\n\n'''''Bold italic text ''with italic 
deactivated'' in between.'''''\n\n'''Bold text..'''\n\n..spanning two 
paragraphs (should not work).'''<nowiki/>'''\n\n'''Bold tag left 
open'''\n\n''Italic tag left open''\n\nNormal text.\n\n<!-- Unmatching number 
of opening, closing tags: -->\n'''This year'<nowiki/>'''s election ''should'' 
beat '''last year''''s.\n\n''Tom'''s car is bigger than 
'''''<nowiki/>'''Susan'''s.\n\nPlain ''italic'''s plain\n");
 add("html2wt", "A table with caption with default-spaced attributes and a 
table row", "{|\n|+ style=\"color: red;\" | caption1\n\n| foo\n|}\n");
 add("html2wt", "A table with captions with non-default spaced attributes and a 
table row", "{|\n|+ style=\"color: red;\" |caption2\n\n|+ style=\"color: red;\" 
| caption3\n\n| foo\n|}\n");
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index a589f9f..b82bb66 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5495,7 +5495,7 @@
 [url={{echo|foo}}]
 [url=http://example.com]
 [http:// bare protocols don't count]
-!! html
+!! html/php
 <p>[foo]
 [foo bar]
 [foo <i>bar</i>]
@@ -5510,6 +5510,20 @@
 [url=<a rel="nofollow" class="external free" 
href="http://example.com";>http://example.com</a>]
 [http:// bare protocols don't count]
 </p>
+!! html/parsoid
+<p>[foo]
+[foo bar]
+[foo <i>bar</i>]
+[fool's] errand
+[fool's errand]
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"{{echo|foo}}"}'>foo</span>]
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"{{echo|foo}}"}'>foo</span> bar]
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"{{echo|foo}}"}'>foo</span> <i>bar</i>]
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"{{echo|foo}}l&#39;s"}'>fool's</span>] errand
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"{{echo|foo}}l&#39;s"}'>fool's</span> errand]
+[<span typeof="mw:Placeholder" 
data-parsoid='{"src":"url={{echo|foo}}"}'>url=foo</span>]
+[url=<a rel="mw:ExtLink" href="http://example.com";>http://example.com</a>]
+[http:// bare protocols don't count]</p>
 !! end
 
 !! test

-- 
To view, visit https://gerrit.wikimedia.org/r/232787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4bad7f699440f3d3a85d40b333fedbc7493f93a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to