From 5ce8c0a496b83d82d437d52e2d5260de23fcfe7f Mon Sep 17 00:00:00 2001 From: Fomafix Date: Thu, 11 Feb 2016 10:37:05 +0000 Subject: [PATCH] mediawiki.api.options: Use formatversion=2 for API requests The format of the JSON response does not change. But the request is different so the test also have to be updated. Change-Id: I391a221f81fd92731c331363a8202c21d6b933b5 --- resources/src/mediawiki/api/options.js | 3 +++ .../mediawiki.api/mediawiki.api.options.test.js | 14 +++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resources/src/mediawiki/api/options.js b/resources/src/mediawiki/api/options.js index 9dd276d60a..bd6fa06808 100644 --- a/resources/src/mediawiki/api/options.js +++ b/resources/src/mediawiki/api/options.js @@ -55,6 +55,7 @@ } else { if ( value !== null ) { deferreds.push( this.postWithToken( 'options', { + formatversion: 2, action: 'options', optionname: name, optionvalue: value @@ -62,6 +63,7 @@ } else { // Omitting value resets the option deferreds.push( this.postWithToken( 'options', { + formatversion: 2, action: 'options', optionname: name } ) ); @@ -71,6 +73,7 @@ if ( grouped.length ) { deferreds.push( this.postWithToken( 'options', { + formatversion: 2, action: 'options', change: grouped } ) ); diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js index a0cfba9848..a48067125f 100644 --- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js +++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.options.test.js @@ -55,17 +55,17 @@ this.server.respond( function ( request ) { switch ( request.requestBody ) { // simple - case 'action=options&format=json&change=foo%3Dbar&token=%2B%5C': + case 'action=options&format=json&formatversion=2&change=foo%3Dbar&token=%2B%5C': // two options - case 'action=options&format=json&change=foo%3Dbar%7Cbaz%3Dquux&token=%2B%5C': + case 'action=options&format=json&formatversion=2&change=foo%3Dbar%7Cbaz%3Dquux&token=%2B%5C': // not bundleable - case 'action=options&format=json&optionname=foo&optionvalue=bar%7Cquux&token=%2B%5C': - case 'action=options&format=json&optionname=bar&optionvalue=a%7Cb%7Cc&token=%2B%5C': - case 'action=options&format=json&change=baz%3Dquux&token=%2B%5C': + case 'action=options&format=json&formatversion=2&optionname=foo&optionvalue=bar%7Cquux&token=%2B%5C': + case 'action=options&format=json&formatversion=2&optionname=bar&optionvalue=a%7Cb%7Cc&token=%2B%5C': + case 'action=options&format=json&formatversion=2&change=baz%3Dquux&token=%2B%5C': // reset an option - case 'action=options&format=json&change=foo&token=%2B%5C': + case 'action=options&format=json&formatversion=2&change=foo&token=%2B%5C': // reset an option, not bundleable - case 'action=options&format=json&optionname=foo%7Cbar%3Dquux&token=%2B%5C': + case 'action=options&format=json&formatversion=2&optionname=foo%7Cbar%3Dquux&token=%2B%5C': assert.ok( true, 'Repond to ' + request.requestBody ); request.respond( 200, { 'Content-Type': 'application/json' }, '{ "options": "success" }' ); -- 2.20.1