[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Sync parserTests with core + code fixes to pass updated tests

jenkins-bot (Code Review) Mon, 13 Nov 2017 11:19:07 -0800

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391059 )


Change subject: Sync parserTests with core + code fixes to pass updated tests
......................................................................


Sync parserTests with core + code fixes to pass updated tests

 * Also, fix ExtResourceURLPatterns to allow non-proto-relative links to
   serialize as magic links so that the updated tests pass.

Change-Id: I1fcdb9bc58db32bb3f62fc37c27cc0a6aa7508da
---
M lib/config/WikiConfig.js
M lib/wt2html/pegTokenizer.pegjs
M tests/parserTests-blacklist.js
M tests/parserTests.json
M tests/parserTests.txt
5 files changed, 47 insertions(+), 43 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index 60dadf3..318d2d8 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -850,8 +850,14 @@
                prefix: "(?:(?:[.][.]?/)*)",
                re: 'Special(?:%3[Aa]|:)Book[Ss]ources(?:%2[Ff]|/)%isbn',
        },
-       'RFC': { re: '//tools.ietf.org/html/rfc%s' },
-       'PMID': { re: '//www.ncbi.nlm.nih.gov/pubmed/%s?dopt=Abstract' },
+       'RFC': {
+               prefix: '[^\/]*',
+               re: '//tools.ietf.org/html/rfc%s',
+       },
+       'PMID': {
+               prefix: '[^\/]*',
+               re: '//www.ncbi.nlm.nih.gov/pubmed/%s?dopt=Abstract',
+       },
 };
 
 var unispace = /[ \u00A0\u1680\u2000-\u200A\u202F\u205F\u3000]+/g;
diff --git a/lib/wt2html/pegTokenizer.pegjs b/lib/wt2html/pegTokenizer.pegjs
index c4029cb..c8fc9d7 100644
--- a/lib/wt2html/pegTokenizer.pegjs
+++ b/lib/wt2html/pegTokenizer.pegjs
@@ -628,11 +628,9 @@
   = ref:('RFC' / 'PMID') sp:space_or_nbsp+ identifier:$[0-9]+ end_of_word
 {
     var base_urls = {
-      'RFC': '//tools.ietf.org/html/rfc%s',
+      'RFC': 'https://tools.ietf.org/html/rfc%s',
       'PMID': '//www.ncbi.nlm.nih.gov/pubmed/%s?dopt=Abstract',
     };
-    var url = tu.sprintf(base_urls[ref], identifier);
-
     return [
         new SelfclosingTagTk('extlink', [
            new KV('href', tu.sprintf(base_urls[ref], identifier)),
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index b541e44..14b908e 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -443,7 +443,7 @@
 add("html2html", "Special:Search page linking.", "<p 
data-parsoid='{\"dsr\":[0,38,0,0]}'><a rel=\"mw:WikiLink\" 
href=\"./Wiki/Special:Search\" title=\"Wiki/Special:Search\" 
data-parsoid='{\"stx\":\"piped\",\"a\":{\"href\":\"./Wiki/Special:Search\"},\"sa\":{\"href\":\"wiki/Special:Search\"},\"dsr\":[0,38,22,2]}'>Special:Search</a></p>\n");
 add("html2html", "Say the magic word", "<ul 
data-parsoid='{\"dsr\":[0,312,0,0]}'><li data-parsoid='{\"dsr\":[0,13,1,0]}'> 
Parser test</li>\n<li data-parsoid='{\"dsr\":[14,27,1,0]}'> 
Parser_test</li>\n<li data-parsoid='{\"dsr\":[28,41,1,0]}'> Parser 
test</li>\n<li data-parsoid='{\"dsr\":[42,55,1,0]}'> Parser_test</li>\n<li 
data-parsoid='{\"dsr\":[56,69,1,0]}'> Parser test</li>\n<li 
data-parsoid='{\"dsr\":[70,83,1,0]}'> Parser_test</li>\n<li 
data-parsoid='{\"dsr\":[84,97,1,0]}'> Parser test</li>\n<li 
data-parsoid='{\"dsr\":[98,111,1,0]}'> Parser_test</li>\n<li 
data-parsoid='{\"dsr\":[112,125,1,0]}'> Parser test</li>\n<li 
data-parsoid='{\"dsr\":[126,139,1,0]}'> Parser_test</li>\n<li 
data-parsoid='{\"dsr\":[140,158,1,0]}'> Talk:Parser test</li>\n<li 
data-parsoid='{\"dsr\":[159,177,1,0]}'> Talk:Parser_test</li>\n<li 
data-parsoid='{\"dsr\":[178,191,1,0]}'> Parser test</li>\n<li 
data-parsoid='{\"dsr\":[192,205,1,0]}'> Parser_test</li>\n<li 
class=\"mw-empty-elt\" data-parsoid='{\"dsr\":[206,208,1,0]}'> </li>\n<li 
class=\"mw-empty-elt\" data-parsoid='{\"dsr\":[209,211,1,0]}'> </li>\n<li 
data-parsoid='{\"dsr\":[212,215,1,0]}'> 0</li>\n<li 
data-parsoid='{\"dsr\":[216,222,1,0]}'> Talk</li>\n<li 
data-parsoid='{\"dsr\":[223,229,1,0]}'> Talk</li>\n<li class=\"mw-empty-elt\" 
data-parsoid='{\"dsr\":[230,232,1,0]}'> </li>\n<li class=\"mw-empty-elt\" 
data-parsoid='{\"dsr\":[233,235,1,0]}'> </li>\n<li 
data-parsoid='{\"dsr\":[236,312,1,0]}'> 
[/index.php?title=Template:Dynamic&amp;action=edit&amp;redlink=1 
Template:Dynamic]</li></ul>\n");
 add("html2html", "Gallery override link with absolute external link with 
LanguageConverter", "<p data-parsoid='{\"dsr\":[0,4,0,0]}'>\t\t* </p><div 
style=\"width: 155px\" data-parsoid='{\"stx\":\"html\",\"dsr\":[4,239,26,6]}'> 
\t\t\t<div class=\"thumb\" style=\"width: 150px;\" 
data-parsoid='{\"stx\":\"html\",\"dsr\":[34,182,41,6]}'><div 
style=\"margin:68px auto;\" 
data-parsoid='{\"stx\":\"html\",\"dsr\":[75,176,31,6]}'><img 
src=\"http://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]}'/></div></div> \t\t\t<div 
class=\"gallerytext\" data-parsoid='{\"stx\":\"html\",\"dsr\":[186,230,25,6]}'> 
caption  \t\t\t</div> \t\t</div>\n");
-add("html2html", "Double RFC with a wiki link", "<p 
data-parsoid='{\"dsr\":[0,62,0,0]}'>RFC 
[/index.php?title=RFC_1234&amp;action=edit&amp;redlink=1 <a 
href=\"//tools.ietf.org/html/rfc1234\" rel=\"mw:ExtLink\" 
data-parsoid='{\"stx\":\"magiclink\",\"dsr\":[53,61,0,0]}'>RFC 
1234</a>]</p>\n");
+add("html2html", "Double RFC with a wiki link", "<p 
data-parsoid='{\"dsr\":[0,62,0,0]}'>RFC 
[/index.php?title=RFC_1234&amp;action=edit&amp;redlink=1 <a 
href=\"https://tools.ietf.org/html/rfc1234\"; rel=\"mw:ExtLink\" 
data-parsoid='{\"stx\":\"magiclink\",\"dsr\":[53,61,0,0]}'>RFC 
1234</a>]</p>\n");
 add("html2html", "Centre-aligned image", "<div class=\"center\" 
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,96,20,6]}'><div class=\"floatnone\" 
data-parsoid='{\"stx\":\"html\",\"dsr\":[20,90,23,6]}'><img 
src=\"http://example.com/images/3/3a/Foobar.jpg\"; alt=\"Foobar.jpg\" 
rel=\"mw:externalImage\" 
data-parsoid='{\"dsr\":[43,84,null,null]}'/></div></div>\n");
 add("html2html", "None-aligned image", "<div class=\"floatnone\" 
data-parsoid='{\"stx\":\"html\",\"dsr\":[0,70,23,6]}'><img 
src=\"http://example.com/images/3/3a/Foobar.jpg\"; alt=\"Foobar.jpg\" 
rel=\"mw:externalImage\" data-parsoid='{\"dsr\":[23,64,null,null]}'/></div>\n");
 add("html2html", "Width + Height sized image (using px) (height is ignored)", 
"<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\" 
data-parsoid='{\"dsr\":[0,64,null,null]}'/></p>\n");
diff --git a/tests/parserTests.json b/tests/parserTests.json
index 78334ff..302e56c 100644
--- a/tests/parserTests.json
+++ b/tests/parserTests.json
@@ -2,8 +2,8 @@
        "parserTests.txt": {
                "repo": "/wikimedia/mediawiki/",
                "path": "tests/parser/parserTests.txt",
-               "expectedSHA1": "81d2ac31b54ef284bc3ac333763e8b7ddb1218bd",
-               "latestCommit": "9ac4ed4b4a28e4f3b42ac3f3b76875e488f25cd9"
+               "expectedSHA1": "e25c2ac3dfd7e954c4dfc6e42b0ec5afacd8205d",
+               "latestCommit": "1b13888ed6bd09731f10045650714a3392bb55df"
        },
        "citeParserTests.txt": {
                "repo": "/wikimedia/mediawiki-extensions-Cite/",
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index cef935c..ff574d1 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -5706,7 +5706,7 @@
 
 !! html/php
 <p><a rel="nofollow" class="external free" 
href="http://[2404:130:0:1000::187:2]/index.php";>http://[2404:130:0:1000::187:2]/index.php</a>
-</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc2373">RFC 2373</a>, section 2.2:
+</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc2373";>RFC 2373</a>, section 2.2:
 </p>
 <ul><li> <a rel="nofollow" class="external free" 
href="http://[1080::8:800:200C:417A]/unicast";>http://[1080::8:800:200C:417A]/unicast</a></li>
 <li> <a rel="nofollow" class="external free" 
href="http://[FF01::101]/multicast";>http://[FF01::101]/multicast</a></li>
@@ -5714,7 +5714,7 @@
 <li> <a rel="nofollow" class="external free" 
href="http://[::]/unspecified";>http://[::]/unspecified</a></li>
 <li> <a rel="nofollow" class="external free" 
href="http://[::13.1.68.3]/ipv4compat";>http://[::13.1.68.3]/ipv4compat</a></li>
 <li> <a rel="nofollow" class="external free" 
href="http://[::FFFF:129.144.52.38]/ipv4compat";>http://[::FFFF:129.144.52.38]/ipv4compat</a></li></ul>
-<p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc2732">RFC 2732</a>, section 2:
+<p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc2732";>RFC 2732</a>, section 2:
 </p>
 <ul><li> <a rel="nofollow" class="external free" 
href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html";>http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html</a></li>
 <li> <a rel="nofollow" class="external free" 
href="http://[1080:0:0:0:8:800:200C:417A]/index.html";>http://[1080:0:0:0:8:800:200C:417A]/index.html</a></li>
@@ -5727,7 +5727,7 @@
 !! html/parsoid
 <p><a rel="mw:ExtLink" 
href="http://[2404:130:0:1000::187:2]/index.php";>http://[2404:130:0:1000::187:2]/index.php</a></p>
 
-<p>Examples from <a href="//tools.ietf.org/html/rfc2373" rel="mw:ExtLink">RFC 
2373</a>, section 2.2:</p>
+<p>Examples from <a href="https://tools.ietf.org/html/rfc2373"; 
rel="mw:ExtLink">RFC 2373</a>, section 2.2:</p>
 <ul><li> <a rel="mw:ExtLink" 
href="http://[1080::8:800:200C:417A]/unicast";>http://[1080::8:800:200C:417A]/unicast</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[FF01::101]/multicast";>http://[FF01::101]/multicast</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[::1]/loopback";>http://[::1]/loopback</a></li>
@@ -5735,7 +5735,7 @@
 <li> <a rel="mw:ExtLink" 
href="http://[::13.1.68.3]/ipv4compat";>http://[::13.1.68.3]/ipv4compat</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[::FFFF:129.144.52.38]/ipv4compat";>http://[::FFFF:129.144.52.38]/ipv4compat</a></li></ul>
 
-<p>Examples from <a href="//tools.ietf.org/html/rfc2732" rel="mw:ExtLink">RFC 
2732</a>, section 2:</p>
+<p>Examples from <a href="https://tools.ietf.org/html/rfc2732"; 
rel="mw:ExtLink">RFC 2732</a>, section 2:</p>
 <ul><li> <a rel="mw:ExtLink" 
href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html";>http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[1080:0:0:0:8:800:200C:417A]/index.html";>http://[1080:0:0:0:8:800:200C:417A]/index.html</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[3ffe:2a00:100:7031::1]";>http://[3ffe:2a00:100:7031::1]</a></li>
@@ -5769,7 +5769,7 @@
 
 !! html/php
 <p><a rel="nofollow" class="external text" 
href="http://[2404:130:0:1000::187:2]/index.php";>test</a>
-</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc2373">RFC 2373</a>, section 2.2:
+</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc2373";>RFC 2373</a>, section 2.2:
 </p>
 <ul><li> <a rel="nofollow" class="external text" 
href="http://[1080::8:800:200C:417A]";>unicast</a></li>
 <li> <a rel="nofollow" class="external text" 
href="http://[FF01::101]";>multicast</a></li>
@@ -5777,7 +5777,7 @@
 <li> <a rel="nofollow" class="external text" 
href="http://[::]";>unspecified</a></li>
 <li> <a rel="nofollow" class="external text" 
href="http://[::13.1.68.3]";>ipv4compat</a></li>
 <li> <a rel="nofollow" class="external text" 
href="http://[::FFFF:129.144.52.38]";>ipv4compat</a></li></ul>
-<p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc2732">RFC 2732</a>, section 2:
+<p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc2732";>RFC 2732</a>, section 2:
 </p>
 <ul><li> <a rel="nofollow" class="external text" 
href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html";>1</a></li>
 <li> <a rel="nofollow" class="external text" 
href="http://[1080:0:0:0:8:800:200C:417A]/index.html";>2</a></li>
@@ -5790,7 +5790,7 @@
 !! html/parsoid
 <p><a rel="mw:ExtLink" 
href="http://[2404:130:0:1000::187:2]/index.php";>test</a></p>
 
-<p>Examples from <a href="//tools.ietf.org/html/rfc2373" rel="mw:ExtLink">RFC 
2373</a>, section 2.2:</p>
+<p>Examples from <a href="https://tools.ietf.org/html/rfc2373"; 
rel="mw:ExtLink">RFC 2373</a>, section 2.2:</p>
 <ul><li> <a rel="mw:ExtLink" 
href="http://[1080::8:800:200C:417A]";>unicast</a></li>
 <li> <a rel="mw:ExtLink" href="http://[FF01::101]";>multicast</a></li>
 <li> <a rel="mw:ExtLink" href="http://[::1]/";>loopback</a></li>
@@ -5798,7 +5798,7 @@
 <li> <a rel="mw:ExtLink" href="http://[::13.1.68.3]";>ipv4compat</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[::FFFF:129.144.52.38]";>ipv4compat</a></li></ul>
 
-<p>Examples from <a href="//tools.ietf.org/html/rfc2732" rel="mw:ExtLink">RFC 
2732</a>, section 2:</p>
+<p>Examples from <a href="https://tools.ietf.org/html/rfc2732"; 
rel="mw:ExtLink">RFC 2732</a>, section 2:</p>
 <ul><li> <a rel="mw:ExtLink" 
href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html";>1</a></li>
 <li> <a rel="mw:ExtLink" 
href="http://[1080:0:0:0:8:800:200C:417A]/index.html";>2</a></li>
 <li> <a rel="mw:ExtLink" href="http://[3ffe:2a00:100:7031::1]";>3</a></li>
@@ -10998,10 +10998,10 @@
 !! wikitext
 RFC 822
 !! html/php
-<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc822">RFC 822</a>
+<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc822";>RFC 822</a>
 </p>
 !! html/parsoid
-<p><a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC 822</a></p>
+<p><a href="https://tools.ietf.org/html/rfc822"; rel="mw:ExtLink">RFC 
822</a></p>
 !! end
 
 !! test
@@ -11009,10 +11009,10 @@
 !! wikitext
 This is RFC 822 but thisRFC 822 is not RFC 822linked.
 !! html/php
-<p>This is <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc822">RFC 822</a> but thisRFC 822 is not RFC 
822linked.
+<p>This is <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc822";>RFC 822</a> but thisRFC 822 is not 
RFC 822linked.
 </p>
 !! html/parsoid
-<p>This is <a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC 822</a> 
but thisRFC 822 is not RFC 822linked.</p>
+<p>This is <a href="https://tools.ietf.org/html/rfc822"; rel="mw:ExtLink">RFC 
822</a> but thisRFC 822 is not RFC 822linked.</p>
 !! end
 
 !! test
@@ -11022,12 +11022,12 @@
 RFC
 822
 !! html/php
-<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc822">RFC 822</a>
+<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc822";>RFC 822</a>
 RFC
 822
 </p>
 !! html/parsoid
-<p><a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC <span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> 
</span><span typeof="mw:Entity" 
data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span><span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> 
</span><span typeof="mw:Entity" 
data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span><span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;#Xa0;","srcContent":" "}'> 
</span> 822</a>
+<p><a href="https://tools.ietf.org/html/rfc822"; rel="mw:ExtLink">RFC <span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> 
</span><span typeof="mw:Entity" 
data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span><span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> 
</span><span typeof="mw:Entity" 
data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span><span 
typeof="mw:Entity" data-parsoid='{"src":"&amp;#Xa0;","srcContent":" "}'> 
</span> 822</a>
 RFC
 822</p>
 !! end
@@ -11123,14 +11123,14 @@
 !! wikitext
 X[[Special:BookSources/0978739256|foo]]
 
-X[//tools.ietf.org/html/rfc1234 foo]
+X[https://tools.ietf.org/html/rfc1234 foo]
 !! html/php
 <p>X<a href="/wiki/Special:BookSources/0978739256" 
title="Special:BookSources/0978739256">foo</a>
-</p><p>X<a rel="nofollow" class="external text" 
href="//tools.ietf.org/html/rfc1234">foo</a>
+</p><p>X<a rel="nofollow" class="external text" 
href="https://tools.ietf.org/html/rfc1234";>foo</a>
 </p>
 !! html/parsoid
 <p>X<a rel="mw:WikiLink" href="./Special:BookSources/0978739256" 
title="Special:BookSources/0978739256">foo</a></p>
-<p>X<a rel="mw:ExtLink" href="//tools.ietf.org/html/rfc1234">foo</a></p>
+<p>X<a rel="mw:ExtLink" href="https://tools.ietf.org/html/rfc1234";>foo</a></p>
 !! end
 
 !! test
@@ -15164,10 +15164,10 @@
 !! wikitext
 [[File:Foobar.jpg|thumb|This is RFC 12354]]
 !! html/php
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a 
href="/wiki/File:Foobar.jpg" class="image"><img 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="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" 
class="internal" title="Enlarge"></a></div>This is <a class="external 
mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc12354">RFC 
12354</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a 
href="/wiki/File:Foobar.jpg" class="image"><img 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="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" 
class="internal" title="Enlarge"></a></div>This is <a class="external 
mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc12354";>RFC 12354</a></div></div></div>
 
 !! html/parsoid
-<figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption>This is <a 
href="//tools.ietf.org/html/rfc12354" rel="mw:ExtLink">RFC 
12354</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption>This is <a 
href="https://tools.ietf.org/html/rfc12354"; rel="mw:ExtLink">RFC 
12354</a></figcaption></figure>
 !! end
 
 !! test
@@ -20978,7 +20978,7 @@
 !! wikitext
 RFC RFC 1234
 !! html
-<p>RFC <a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc1234">RFC 1234</a>
+<p>RFC <a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc1234";>RFC 1234</a>
 </p>
 !! end
 
@@ -20996,10 +20996,10 @@
 !! wikitext
 RFC   983&#x20;987
 !! html
-<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc983">RFC 983</a>&#x20;987
+<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc983";>RFC 983</a>&#x20;987
 </p>
 !! html+tidy
-<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc983">RFC 983</a> 987</p>
+<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc983";>RFC 983</a> 987</p>
 !! end
 
 !! test
@@ -25754,9 +25754,9 @@
 !! options
 parsoid=html2wt
 !! html/parsoid
-<p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>4
-<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y
-X<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y</p>
+<p><a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>4
+<a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y
+X<a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y</p>
 !! wikitext
 RFC 123<nowiki/>4
 RFC 123<nowiki/>y
@@ -25768,18 +25768,18 @@
 !! options
 parsoid=html2wt
 !! html/parsoid
-<p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>?foo
-<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>&amp;foo
--<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>-
+<p><a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>?foo
+<a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>&amp;foo
+-<a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink" 
data-parsoid='{"stx":"magiclink"}'>RFC 123</a>-
 </p>
 !! wikitext
 RFC 123?foo
 RFC 123&foo
 -RFC 123-
 !! html/php
-<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc123">RFC 123</a>?foo
-<a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc123">RFC 123</a>&amp;foo
--<a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc123">RFC 123</a>-
+<p><a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc123";>RFC 123</a>?foo
+<a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc123";>RFC 123</a>&amp;foo
+-<a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc123";>RFC 123</a>-
 </p>
 !! end
 
@@ -28040,9 +28040,9 @@
 !! options
 parsoid=html2wt
 !! html/parsoid
-<a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink">New RFC</a>
+<a href="https://tools.ietf.org/html/rfc123"; rel="mw:ExtLink">New RFC</a>
 !! wikitext
-[//tools.ietf.org/html/rfc123 New RFC]
+[https://tools.ietf.org/html/rfc123 New RFC]
 !! end
 
 !! test
@@ -28186,7 +28186,7 @@
 <div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" 
class="image"><img 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="thumbcaption">
 <div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" 
title="Enlarge"></a></div>
-<a class="external mw-magiclink-rfc" rel="nofollow" 
href="//tools.ietf.org/html/rfc1234">RFC 1234</a></div>
+<a class="external mw-magiclink-rfc" rel="nofollow" 
href="https://tools.ietf.org/html/rfc1234";>RFC 1234</a></div>
 </div>
 </div>
 <div class="thumb tright">
@@ -28205,7 +28205,7 @@
 </div>
 !! html/parsoid
 <figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption><a rel="mw:ExtLink" 
href="http://example.com";>http://example.com</a></figcaption></figure>
-<figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption><a 
href="//tools.ietf.org/html/rfc1234" rel="mw:ExtLink">RFC 
1234</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption><a 
href="https://tools.ietf.org/html/rfc1234"; rel="mw:ExtLink">RFC 
1234</a></figcaption></figure>
 <figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption><a 
href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract" rel="mw:ExtLink">PMID 
1234</a></figcaption></figure>
 <figure class="mw-default-size" typeof="mw:Image/Thumb"><a 
href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" 
src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" 
data-file-width="1941" data-file-height="220" data-file-type="bitmap" 
height="25" width="220"/></a><figcaption><a 
href="./Special:BookSources/123456789X" rel="mw:WikiLink">ISBN 
123456789x</a></figcaption></figure>
 !! end

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1fcdb9bc58db32bb3f62fc37c27cc0a6aa7508da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org>
Gerrit-Reviewer: Sbailey <sbai...@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] mediawiki...parsoid[master]: Sync parserTests with core + code fixes to pass updated tests

Reply via email to