jenkins-bot has submitted this change and it was merged.
Change subject: Finish quoting the profile in our content type strings
......................................................................
Finish quoting the profile in our content type strings
Follow up to I4a22830248b712f340c60a9f417395a6ac90fb76, which missed
the profile used for `data-parsoid` in page bundles. Also updated
the profile in our swagger spec (which is not actually used at
run time) and that we send to Parsoid in our test cases.
Test case for the newly quoted profile is added in
Ie474bde283a4e9c98d5139fba127ba3fae6f7151.
Change-Id: Ie875223014941d6eeb86c4d054e1142aacbf3254
---
M lib/mediawiki.DOMPostProcessor.js
M specs/apiv2.yaml
M tests/mocha/api.js
3 files changed, 22 insertions(+), 22 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.DOMPostProcessor.js
b/lib/mediawiki.DOMPostProcessor.js
index 1967a23..7976f5f 100644
--- a/lib/mediawiki.DOMPostProcessor.js
+++ b/lib/mediawiki.DOMPostProcessor.js
@@ -344,7 +344,7 @@
var script = document.createElement("script");
DU.addAttributes(script, {
id: "mw-data-parsoid",
- type:
"application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1;charset=utf-8",
+ type:
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1;charset=utf-8"',
});
script.appendChild(document.createTextNode(dp));
document.head.appendChild(script);
diff --git a/specs/apiv2.yaml b/specs/apiv2.yaml
index 6921595..1e2f6b5 100644
--- a/specs/apiv2.yaml
+++ b/specs/apiv2.yaml
@@ -41,7 +41,7 @@
default: 1
get:
produces:
- - text/html; profile=mediawiki.org/specs/html/1.0.0
+ - text/html;profile="mediawiki.org/specs/html/1.0.0"
responses:
200:
description: HTML
@@ -49,7 +49,7 @@
$ref: '#/definitions/HTML'
post:
produces:
- - text/html; profile=mediawiki.org/specs/html/1.0.0
+ - text/html;profile="mediawiki.org/specs/html/1.0.0"
parameters:
- in: body
name: body
@@ -71,7 +71,7 @@
default: en.wikipedia.org
post:
produces:
- - text/html; profile=mediawiki.org/specs/html/1.0.0
+ - text/html;profile="mediawiki.org/specs/html/1.0.0"
parameters:
- in: body
name: body
@@ -192,12 +192,12 @@
body:
type: string
produces:
- - text/plain; profile=mediawiki.org/specs/wikitext/1.0.0
+ - text/plain;profile="mediawiki.org/specs/wikitext/1.0.0"
HTML:
type: string
produces:
- - text/html; profile=mediawiki.org/specs/html/1.0.0
+ - text/html;profile="mediawiki.org/specs/html/1.0.0"
DataParsoid:
type: object
@@ -207,7 +207,7 @@
ids:
type: object
produces:
- - application/json; profile=mediawiki.org/specs/data-parsoid/0.0.1
+ - application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"
PageBundle:
type: object
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index b461084..a058f96 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -1,4 +1,4 @@
-/** Cases for testing the Pasoid API through HTTP */
+/** Cases for testing the Parsoid API through HTTP */
'use strict';
/*global describe, it, before*/
@@ -194,13 +194,13 @@
revid: 0,
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body: "<!DOCTYPE
html>\n<html prefix=\"dc: http://purl.org/dc/terms/ mw:
http://mediawiki.org/rdf/\";
about=\"http://localhost/index.php/Special:Redirect/revision/1\";><head
prefix=\"mwr: http://localhost/index.php/Special:Redirect/\";><meta
property=\"mw:articleNamespace\" content=\"0\"/><link rel=\"dc:replaces\"
resource=\"mwr:revision/0\"/><meta property=\"dc:modified\"
content=\"2014-09-12T22:46:59.000Z\"/><meta about=\"mwr:user/0\"
property=\"dc:title\" content=\"MediaWiki default\"/><link
rel=\"dc:contributor\" resource=\"mwr:user/0\"/><meta
property=\"mw:revisionSHA1\"
content=\"8e0aa2f2a7829587801db67d0424d9b447e09867\"/><meta
property=\"dc:description\" content=\"\"/><meta property=\"mw:parsoidVersion\"
content=\"0\"/><link rel=\"dc:isVersionOf\"
href=\"http://localhost/index.php/Main_Page\"/><title>Main_Page</title><base
href=\"http://localhost/index.php/\"/><link rel=\"stylesheet\"
href=\"//localhost/load.php?modules=mediawiki.legacy.commonPrint,shared|mediawiki.skinning.elements|mediawiki.skinning.content|mediawiki.skinning.interface|skins.vector.styles|site|mediawiki.skinning.content.parsoid&only=styles&debug=true&skin=vector\"/></head><body
id=\"mwAA\" lang=\"en\" class=\"mw-content-ltr sitedir-ltr ltr mw-body
mw-body-content mediawiki\" dir=\"ltr\"><p id=\"mwAQ\"><strong
id=\"mwAg\">MediaWiki has been successfully installed.</strong></p>\n\n<p
id=\"mwAw\">Consult the <a rel=\"mw:ExtLink\"
href=\"//meta.wikimedia.org/wiki/Help:Contents\" id=\"mwBA\">User's Guide</a>
for information on using the wiki software.</p>\n\n<h2 id=\"mwBQ\"> Getting
started </h2>\n<ul id=\"mwBg\"><li id=\"mwBw\"> <a rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings\"
id=\"mwCA\">Configuration settings list</a></li>\n<li id=\"mwCQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ\"
id=\"mwCg\">MediaWiki FAQ</a></li>\n<li id=\"mwCw\"> <a rel=\"mw:ExtLink\"
href=\"https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce\";
id=\"mwDA\">MediaWiki release mailing list</a></li>\n<li id=\"mwDQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources\"
id=\"mwDg\">Localise MediaWiki for your language</a></li></ul></body></html>",
},
"data-parsoid": {
headers: {
- 'content-type':
'application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1',
+ 'content-type':
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"',
},
body: {
"counter": 14,
@@ -230,13 +230,13 @@
revid: 1,
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body: "<!DOCTYPE
html>\n<html prefix=\"dc: http://purl.org/dc/terms/ mw:
http://mediawiki.org/rdf/\";
about=\"http://localhost/index.php/Special:Redirect/revision/1\";><head
prefix=\"mwr: http://localhost/index.php/Special:Redirect/\";><meta
property=\"mw:articleNamespace\" content=\"0\"/><link rel=\"dc:replaces\"
resource=\"mwr:revision/0\"/><meta property=\"dc:modified\"
content=\"2014-09-12T22:46:59.000Z\"/><meta about=\"mwr:user/0\"
property=\"dc:title\" content=\"MediaWiki default\"/><link
rel=\"dc:contributor\" resource=\"mwr:user/0\"/><meta
property=\"mw:revisionSHA1\"
content=\"8e0aa2f2a7829587801db67d0424d9b447e09867\"/><meta
property=\"dc:description\" content=\"\"/><meta property=\"mw:parsoidVersion\"
content=\"0\"/><link rel=\"dc:isVersionOf\"
href=\"http://localhost/index.php/Main_Page\"/><title>Main_Page</title><base
href=\"http://localhost/index.php/\"/><link rel=\"stylesheet\"
href=\"//localhost/load.php?modules=mediawiki.legacy.commonPrint,shared|mediawiki.skinning.elements|mediawiki.skinning.content|mediawiki.skinning.interface|skins.vector.styles|site|mediawiki.skinning.content.parsoid&only=styles&debug=true&skin=vector\"/></head><body
id=\"mwAA\" lang=\"en\" class=\"mw-content-ltr sitedir-ltr ltr mw-body
mw-body-content mediawiki\" dir=\"ltr\"><p id=\"mwAQ\"><strong
id=\"mwAg\">MediaWiki has been successfully installed.</strong></p>\n\n<p
id=\"mwAw\">Consult the <a rel=\"mw:ExtLink\"
href=\"//meta.wikimedia.org/wiki/Help:Contents\" id=\"mwBA\">User's Guide</a>
for information on using the wiki software.</p>\n\n<h2 id=\"mwBQ\"> Getting
started </h2>\n<ul id=\"mwBg\"><li id=\"mwBw\"> <a rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings\"
id=\"mwCA\">Configuration settings list</a></li>\n<li id=\"mwCQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ\"
id=\"mwCg\">MediaWiki FAQ</a></li>\n<li id=\"mwCw\"> <a rel=\"mw:ExtLink\"
href=\"https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce\";
id=\"mwDA\">MediaWiki release mailing list</a></li>\n<li id=\"mwDQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources\"
id=\"mwDg\">Localise MediaWiki for your language</a></li></ul></body></html>",
},
"data-parsoid": {
headers: {
- 'content-type':
'application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1',
+ 'content-type':
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"',
},
body: {
"counter": 14,
@@ -291,7 +291,7 @@
.send({
wikitext: {
headers: {
- 'content-type':
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0',
+ 'content-type':
'text/plain;profile="mediawiki.org/specs/wikitext/1.0.0"',
},
body: "== h2 ==",
},
@@ -333,7 +333,7 @@
original: {
wikitext: {
headers: {
- 'content-type':
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0',
+ 'content-type':
'text/plain;profile="mediawiki.org/specs/wikitext/1.0.0"',
},
body: "== h2 ==",
},
@@ -455,7 +455,7 @@
.send({
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body: '<!DOCTYPE html>\n<html
prefix="dc: http://purl.org/dc/terms/ mw: http://mediawiki.org/rdf/";
about="http://localhost/index.php/Special:Redirect/revision/1";><head
prefix="mwr: http://localhost/index.php/Special:Redirect/";><meta
property="mw:articleNamespace" content="0"/><link rel="dc:replaces"
resource="mwr:revision/0"/><meta property="dc:modified"
content="2014-09-12T22:46:59.000Z"/><meta about="mwr:user/0"
property="dc:title" content="MediaWiki default"/><link rel="dc:contributor"
resource="mwr:user/0"/><meta property="mw:revisionSHA1"
content="8e0aa2f2a7829587801db67d0424d9b447e09867"/><meta
property="dc:description" content=""/><meta property="mw:parsoidVersion"
content="0"/><link rel="dc:isVersionOf"
href="http://localhost/index.php/Main_Page"/><title>Main_Page</title><base
href="http://localhost/index.php/"/><link rel="stylesheet"
href="//localhost/load.php?modules=mediawiki.legacy.commonPrint,shared|mediawiki.skinning.elements|mediawiki.skinning.content|mediawiki.skinning.interface|skins.vector.styles|site|mediawiki.skinning.content.parsoid&only=styles&debug=true&skin=vector"/></head><body
data-parsoid=\'{"dsr":[0,592,0,0]}\' lang="en" class="mw-content-ltr
sitedir-ltr ltr mw-body mw-body-content mediawiki" dir="ltr"><p
data-parsoid=\'{"dsr":[0,59,0,0]}\'><strong
data-parsoid=\'{"stx":"html","dsr":[0,59,8,9]}\'>MediaWiki has been
successfully installed.</strong></p>\n\n<p
data-parsoid=\'{"dsr":[61,171,0,0]}\'>Consult the <a rel="mw:ExtLink"
href="//meta.wikimedia.org/wiki/Help:Contents"
data-parsoid=\'{"targetOff":114,"contentOffsets":[114,126],"dsr":[73,127,41,1]}\'>User\'s
Guide</a> for information on using the wiki software.</p>\n\n<h2
data-parsoid=\'{"dsr":[173,194,2,2]}\'> Getting started </h2>\n<ul
data-parsoid=\'{"dsr":[195,592,0,0]}\'><li
data-parsoid=\'{"dsr":[195,300,1,0]}\'> <a rel="mw:ExtLink"
href="//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings"
data-parsoid=\'{"targetOff":272,"contentOffsets":[272,299],"dsr":[197,300,75,1]}\'>Configuration
settings list</a></li>\n<li data-parsoid=\'{"dsr":[301,373,1,0]}\'> <a
rel="mw:ExtLink" href="//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ"
data-parsoid=\'{"targetOff":359,"contentOffsets":[359,372],"dsr":[303,373,56,1]}\'>MediaWiki
FAQ</a></li>\n<li data-parsoid=\'{"dsr":[374,472,1,0]}\'> <a rel="mw:ExtLink"
href="https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce";
data-parsoid=\'{"targetOff":441,"contentOffsets":[441,471],"dsr":[376,472,65,1]}\'>MediaWiki
release mailing list</a></li>\n<li data-parsoid=\'{"dsr":[473,592,1,0]}\'> <a
rel="mw:ExtLink"
href="//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources"
data-parsoid=\'{"targetOff":555,"contentOffsets":[555,591],"dsr":[475,592,80,1]}\'>Localise
MediaWiki for your language</a></li></ul></body></html>',
},
@@ -533,7 +533,7 @@
original: {
wikitext: {
headers: {
- 'content-type':
'text/plain;profile=mediawiki.org/specs/wikitext/1.0.0',
+ 'content-type':
'text/plain;profile="mediawiki.org/specs/wikitext/1.0.0"',
},
body:
'<strong>MediaWiki has been successfully installed.</strong>\n\nConsult the
[//meta.wikimedia.org/wiki/Help:Contents User\'s Guide] for information on
using the wiki software.\n\n== Getting started ==\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings
Configuration settings list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n*
[https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki
release mailing list]\n*
[//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources
Localise MediaWiki for your language]\n',
},
@@ -554,13 +554,13 @@
original: {
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body: "<!DOCTYPE
html>\n<html prefix=\"dc: http://purl.org/dc/terms/ mw:
http://mediawiki.org/rdf/\";
about=\"http://localhost/index.php/Special:Redirect/revision/1\";><head
prefix=\"mwr: http://localhost/index.php/Special:Redirect/\";><meta
property=\"mw:articleNamespace\" content=\"0\"/><link rel=\"dc:replaces\"
resource=\"mwr:revision/0\"/><meta property=\"dc:modified\"
content=\"2014-09-12T22:46:59.000Z\"/><meta about=\"mwr:user/0\"
property=\"dc:title\" content=\"MediaWiki default\"/><link
rel=\"dc:contributor\" resource=\"mwr:user/0\"/><meta
property=\"mw:revisionSHA1\"
content=\"8e0aa2f2a7829587801db67d0424d9b447e09867\"/><meta
property=\"dc:description\" content=\"\"/><meta property=\"mw:parsoidVersion\"
content=\"0\"/><link rel=\"dc:isVersionOf\"
href=\"http://localhost/index.php/Main_Page\"/><title>Main_Page</title><base
href=\"http://localhost/index.php/\"/><link rel=\"stylesheet\"
href=\"//localhost/load.php?modules=mediawiki.legacy.commonPrint,shared|mediawiki.skinning.elements|mediawiki.skinning.content|mediawiki.skinning.interface|skins.vector.styles|site|mediawiki.skinning.content.parsoid&only=styles&debug=true&skin=vector\"/></head><body
id=\"mwAA\" lang=\"en\" class=\"mw-content-ltr sitedir-ltr ltr mw-body
mw-body-content mediawiki\" dir=\"ltr\"><p id=\"mwAQ\"><strong
id=\"mwAg\">MediaWiki has been successfully installed.</strong></p>\n\n<p
id=\"mwAw\">Consult the <a rel=\"mw:ExtLink\"
href=\"//meta.wikimedia.org/wiki/Help:Contents\" id=\"mwBA\">User's Guide</a>
for information on using the wiki software.</p>\n\n<h2 id=\"mwBQ\"> Getting
started </h2>\n<ul id=\"mwBg\"><li id=\"mwBw\"> <a rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings\"
id=\"mwCA\">Configuration settings list</a></li>\n<li id=\"mwCQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ\"
id=\"mwCg\">MediaWiki FAQ</a></li>\n<li id=\"mwCw\"> <a rel=\"mw:ExtLink\"
href=\"https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce\";
id=\"mwDA\">MediaWiki release mailing list</a></li>\n<li id=\"mwDQ\"> <a
rel=\"mw:ExtLink\"
href=\"//www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources\"
id=\"mwDg\">Localise MediaWiki for your language</a></li></ul></body></html>",
},
"data-parsoid": {
headers: {
- 'content-type':
'application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1',
+ 'content-type':
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"',
},
body: {
"counter": 14,
@@ -586,13 +586,13 @@
original: {
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body:
'<html><head></head><body><p>ho</p></body></html>',
},
'data-parsoid': {
headers: {
- 'content-type':
'application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1',
+ 'content-type':
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"',
},
body: {},
},
@@ -610,13 +610,13 @@
original: {
html: {
headers: {
- 'content-type':
'text/html;profile=mediawiki.org/specs/html/1.0.0',
+ 'content-type':
'text/html;profile="mediawiki.org/specs/html/1.0.0"',
},
body:
'<html><head></head><body><p>ho</p></body></html>',
},
'data-parsoid': {
headers: {
- 'content-type':
'application/json;profile=mediawiki.org/specs/data-parsoid/0.0.1',
+ 'content-type':
'application/json;profile="mediawiki.org/specs/data-parsoid/0.0.1"',
},
body: 'Garbled text
from RESTBase.',
},
--
To view, visit https://gerrit.wikimedia.org/r/233601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie875223014941d6eeb86c4d054e1142aacbf3254
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Arlolra <[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
