jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395011 )
Change subject: Bump Parsoid HTML version to 1.6.0
......................................................................
Bump Parsoid HTML version to 1.6.0
Change-Id: I48ec581a03b26a7ead96747e2b13fe63de428d15
---
M bin/roundtrip-test.js
M lib/config/MWParserEnvironment.js
M tests/mocha/api.js
M tests/mocha/templatedata.js
4 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
BearND: Looks good to me, but someone else must approve
jenkins-bot: Verified
Arlolra: Looks good to me, approved
Objections:
Mobrovac: There's a problem with this change, please improve
diff --git a/bin/roundtrip-test.js b/bin/roundtrip-test.js
index 2f97dda..76a544b 100755
--- a/bin/roundtrip-test.js
+++ b/bin/roundtrip-test.js
@@ -16,7 +16,7 @@
var gzip = Promise.promisify(require('zlib').gzip, false);
-var defaultContentVersion = '1.5.0';
+var defaultContentVersion = '1.6.0';
function displayDiff(type, count) {
var pad = (10 - type.length); // Be positive!
diff --git a/lib/config/MWParserEnvironment.js
b/lib/config/MWParserEnvironment.js
index 56861fb..d448823 100644
--- a/lib/config/MWParserEnvironment.js
+++ b/lib/config/MWParserEnvironment.js
@@ -746,7 +746,7 @@
*
* @property {Array} availableVersions
*/
-MWParserEnvironment.prototype.availableVersions = ['1.5.0', '2.0.0'];
+MWParserEnvironment.prototype.availableVersions = ['1.6.0', '2.0.0'];
/**
* The default content version that Parsoid will generate.
diff --git a/tests/mocha/api.js b/tests/mocha/api.js
index 4d2208a..6a1c2d7 100644
--- a/tests/mocha/api.js
+++ b/tests/mocha/api.js
@@ -22,7 +22,7 @@
parsoidOptions.useBatchAPI = true;
parsoidOptions.linting = true;
-var defaultContentVersion = '1.5.0';
+var defaultContentVersion = '1.6.0';
// section wrappers are a distraction from the main business of
// this file which is to verify functionality of API end points
@@ -255,7 +255,7 @@
request(api)
.post(mockDomain + '/v3/transform/wikitext/to/html/')
.set('Accept',
- 'text/html;
profile="https://www.mediawiki.org/wiki/Specs/HTML/1.5.0";; q=0.5,' +
+ 'text/html;
profile="https://www.mediawiki.org/wiki/Specs/HTML/1.6.0";; q=0.5,' +
'text/html;
profile="https://www.mediawiki.org/wiki/Specs/HTML/2.0.0";; q=0.8')
.send({ wikitext: '== h2 ==' })
.expect(200)
@@ -268,7 +268,7 @@
request(api)
.post(mockDomain +
'/v3/transform/wikitext/to/pagebundle/')
.set('Accept',
- 'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/1.5.0";; q=0.5,' +
+ 'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/1.6.0";; q=0.5,' +
'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/2.0.0";; q=0.8')
.send({ wikitext: '== h2 ==' })
.expect(200)
@@ -300,7 +300,7 @@
.set('Accept', 'text/html;
profile="mediawiki.org/specs/html/1.2.1"')
.send({ wikitext: '{{echo|hi}}' })
.expect(200)
- .expect(acceptableHtmlResponse('1.5.0'))
+ .expect(acceptableHtmlResponse('1.6.0'))
.end(done);
});
@@ -310,12 +310,12 @@
.set('Accept', 'text/html;
profile="mediawiki.org/specs/html/1.2.1"')
.send({ wikitext: '{{echo|hi}}' })
.expect(200)
- .expect(acceptablePageBundleResponse('1.5.0'))
+ .expect(acceptablePageBundleResponse('1.6.0'))
.end(done);
});
it('should accept requests for content version 1.x (html)',
function(done) {
- var contentVersion = '1.5.0';
+ var contentVersion = '1.6.0';
request(api)
.post(mockDomain + '/v3/transform/wikitext/to/html/')
.set('Accept', 'text/html;
profile="https://www.mediawiki.org/wiki/Specs/HTML/' + contentVersion + '"')
@@ -326,7 +326,7 @@
});
it('should accept requests for content version 1.x
(pagebundle)', function(done) {
- var contentVersion = '1.5.0';
+ var contentVersion = '1.6.0';
request(api)
.post(mockDomain +
'/v3/transform/wikitext/to/pagebundle/')
.set('Accept', 'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/' + contentVersion +
'"')
@@ -1082,7 +1082,7 @@
},
"data-parsoid": {
headers: {
- 'content-type':
'application/json;profile="https://www.mediawiki.org/wiki/Specs/data-parsoid/1.5.0";',
+ 'content-type':
'application/json;profile="https://www.mediawiki.org/wiki/Specs/data-parsoid/1.6.0";',
},
body: {
"counter": 14,
@@ -1359,7 +1359,7 @@
},
html: {
headers: {
- 'content-type':
'text/html;profile="https://www.mediawiki.org/wiki/Specs/HTML/1.5.0";',
+ 'content-type':
'text/html;profile="https://www.mediawiki.org/wiki/Specs/HTML/1.6.0";',
},
body: '<p about="#mwt1"
typeof="mw:Transclusion" id="mwAQ">ho</p>',
},
@@ -1759,7 +1759,7 @@
});
it('should refuse an unknown conversion (1.x -> 2.x)',
function(done) {
-
previousRevHTML.html.headers['content-type'].should.equal('text/html;profile="https://www.mediawiki.org/wiki/Specs/HTML/1.5.0";');
+
previousRevHTML.html.headers['content-type'].should.equal('text/html;profile="https://www.mediawiki.org/wiki/Specs/HTML/1.6.0";');
request(api)
.post(mockDomain +
'/v3/transform/pagebundle/to/pagebundle/Reuse_Page/100')
.set('Accept', 'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/2.0.0";')
@@ -1771,7 +1771,7 @@
});
it('should downgrade 2.x content to 1.x', function(done) {
- var contentVersion = '1.5.0';
+ var contentVersion = '1.6.0';
request(api)
.post(mockDomain +
'/v3/transform/pagebundle/to/pagebundle/')
.set('Accept', 'application/json;
profile="https://www.mediawiki.org/wiki/Specs/pagebundle/' + contentVersion +
'"')
diff --git a/tests/mocha/templatedata.js b/tests/mocha/templatedata.js
index 0d81382..71c5a1d 100644
--- a/tests/mocha/templatedata.js
+++ b/tests/mocha/templatedata.js
@@ -17,7 +17,7 @@
var parsoidOptions = yaml.load(optionsYaml).services[0].conf;
var api, runner;
-var defaultContentVersion = '1.5.0';
+var defaultContentVersion = '1.6.0';
var mockDomain = 'customwiki';
function verifyTransformation(newHTML, origHTML, origWT, expectedWT, done,
dpVersion) {
--
To view, visit https://gerrit.wikimedia.org/r/395011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48ec581a03b26a7ead96747e2b13fe63de428d15
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: C. Scott Ananian <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: Sbailey <[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
