diff --git a/extension.json b/extension.json index 1e8ac646d..d1cbca13e 100644 --- a/extension.json +++ b/extension.json @@ -55,8 +55,8 @@ "PopupsOptInDefaultState": "0", "@PopupsConflictingNavPopupsGadgetName": "@var string: Navigation popups gadget name", "PopupsConflictingNavPopupsGadgetName": "Navigation_popups", - "@PopupsAPIUseRESTBase": "Whether to use RESTBase rather than the MediaWiki API for fetching Popups data.", - "PopupsAPIUseRESTBase": false, + "@PopupsGateway": "Which gateway to use for fetching Popups data. Available options: [mwApiPlain|restbasePlain|restbaseHTML]. Full and always up to date list is available in src/gateway/index.js", + "PopupsGateway": "mwApiPlain", "@PopupsAnonsEnabledSamplingRate": "Sampling rate for showing popups to anonymous users.", "PopupsAnonsEnabledSamplingRate": 0.9, "@PopupsStatsvSamplingRate": "Sampling rate for logging performance data to statsv.", diff --git a/includes/PopupsHooks.php b/includes/PopupsHooks.php index f7b7d001c..d53e0ef18 100644 --- a/includes/PopupsHooks.php +++ b/includes/PopupsHooks.php @@ -120,7 +120,7 @@ class PopupsHooks { $conf = PopupsContext::getInstance()->getConfig(); $vars['wgPopupsSchemaSamplingRate'] = $conf->get( 'PopupsSchemaSamplingRate' ); $vars['wgPopupsBetaFeature'] = $conf->get( 'PopupsBetaFeature' ); - $vars['wgPopupsAPIUseRESTBase'] = $conf->get( 'PopupsAPIUseRESTBase' ); + $vars['wgPopupsGateway'] = $conf->get( 'PopupsGateway' ); $vars['wgPopupsAnonsEnabledSamplingRate'] = $conf->get( 'PopupsAnonsEnabledSamplingRate' ); $vars['wgPopupsStatsvSamplingRate'] = $conf->get( 'PopupsStatsvSamplingRate' ); } diff --git a/resources/dist/index.js b/resources/dist/index.js index e69f7f22f..53007caa9 100644 Binary files a/resources/dist/index.js and b/resources/dist/index.js differ diff --git a/resources/dist/index.js.map b/resources/dist/index.js.map index 06b9f6a36..39a0fdfc6 100644 Binary files a/resources/dist/index.js.map and b/resources/dist/index.js.map differ diff --git a/src/formatter.js b/src/formatter.js index 096f547e4..aabfef275 100644 --- a/src/formatter.js +++ b/src/formatter.js @@ -7,14 +7,14 @@ var $ = jQuery, * @param {String} title * @returns {Array} */ -function htmlize( plainTextExtract, title ) { +function formatPlainTextExtract( plainTextExtract, title ) { var extract = plainTextExtract; if ( plainTextExtract === undefined ) { return []; } extract = removeParentheticals( extract ); - extract = removeEllipsis( extract ); + extract = removeTrailingEllipsis( extract ); // After cleaning the extract it may have been blanked if ( extract.length === 0 ) { @@ -78,7 +78,7 @@ function makeTitleInExtractBold( extract, title ) { * @param {String} extract * @return {String} */ -function removeEllipsis( extract ) { +function removeTrailingEllipsis( extract ) { return extract.replace( /\.\.\.$/, '' ); } @@ -127,5 +127,7 @@ function removeParentheticals( extract ) { } module.exports = { - htmlize: htmlize + formatPlainTextExtract: formatPlainTextExtract, + removeTrailingEllipsis: removeTrailingEllipsis, + removeParentheticals: removeParentheticals }; diff --git a/src/gateway/html/rest.js b/src/gateway/html/rest.js new file mode 100644 index 000000000..7e07b5309 --- /dev/null +++ b/src/gateway/html/rest.js @@ -0,0 +1,35 @@ +var formatter = require( '../../formatter' ), + restbaseProvider = require( '../restProvider' ), + $ = jQuery; + +/** + * Creates an instance of the RESTBase gateway. + * + * This gateway differs from the {@link MediaWikiGateway MediaWiki gateway} in + * that it fetches page data from [the RESTBase page summary endpoint][0]. + * + * [0]: https://en.wikipedia.org/api/rest_v1/#!/Page_content/get_page_summary_title + * + * @param {Function} ajax A function with the same signature as `jQuery.ajax` + * @param {Object} config Configuration that affects the major behavior of the + * gateway. + * @param {Number} config.THUMBNAIL_SIZE The length of the major dimension of + * the thumbnail. + * @returns {RESTBaseGateway} + */ +module.exports = function createRESTHTMLBaseGateway( ajax, config ) { + return restbaseProvider( ajax, config, parseHTMLResponse ); +}; + +/** + * Prepare extract + * @param {Object} page Rest response + * @returns {Array} An array of DOM Elements + */ +function parseHTMLResponse( page ) { + var extract = page.extract_html; + extract = formatter.removeTrailingEllipsis( extract ); + extract = formatter.removeParentheticals( extract ); + + return extract.length === 0 ? [] : $.parseHTML( extract ); +} diff --git a/src/gateway/index.js b/src/gateway/index.js index 6baa6b37d..ecd5f9266 100644 --- a/src/gateway/index.js +++ b/src/gateway/index.js @@ -18,6 +18,7 @@ */ module.exports = { - createMediaWikiApiGateway: require( './mediawiki' ), - createRESTBaseGateway: require( './rest' ) + mwApiPlain: require( './plain/mediawiki' ), + restbasePlain: require( './plain/rest' ), + restbaseHTML: require( './html/rest' ) }; diff --git a/src/gateway/mediawiki.js b/src/gateway/plain/mediawiki.js similarity index 86% rename from src/gateway/mediawiki.js rename to src/gateway/plain/mediawiki.js index 402963e18..44a615ef8 100644 --- a/src/gateway/mediawiki.js +++ b/src/gateway/plain/mediawiki.js @@ -13,8 +13,8 @@ // // FIXME: Move this to src/constants.js. var CACHE_LIFETIME = 300, - createModel = require( '../preview/model' ).createModel, - plainTextHTMLizer = require( '../formatter' ).htmlize, + modelBuilder = require( '../../preview/model' ), + formatter = require( '../../formatter' ), $ = jQuery; /** @@ -71,7 +71,7 @@ module.exports = function createMediaWikiApiGateway( api, config ) { function getPageSummary( title ) { return fetch( title ) .then( extractPageFromResponse ) - .then( htmlize ) + .then( formatPlainTextExtract ) .then( convertPageToModel ); } @@ -80,7 +80,7 @@ module.exports = function createMediaWikiApiGateway( api, config ) { extractPageFromResponse: extractPageFromResponse, convertPageToModel: convertPageToModel, getPageSummary: getPageSummary, - htmlize: htmlize + formatPlainTextExtract: formatPlainTextExtract }; }; @@ -107,16 +107,16 @@ function extractPageFromResponse( data ) { } /** - * HTMLize plain text response + * Make plain text nicer by applying formatter. * * @function - * @name MediaWikiGateway#htmlize + * @name MediaWikiGateway#formatPlainTextExtract * @param {Object} data The response * @returns {Object} */ -function htmlize( data ) { +function formatPlainTextExtract( data ) { var result = $.extend( {}, data ); - result.extract = plainTextHTMLizer( data.extract, data.title ); + result.extract = formatter.formatPlainTextExtract( data.extract, data.title ); return result; } @@ -129,7 +129,7 @@ function htmlize( data ) { * @returns {PreviewModel} */ function convertPageToModel( page ) { - return createModel( + return modelBuilder.createModel( page.title, page.canonicalurl, page.pagelanguagehtmlcode, diff --git a/src/gateway/plain/rest.js b/src/gateway/plain/rest.js new file mode 100644 index 000000000..4cfe0c2a0 --- /dev/null +++ b/src/gateway/plain/rest.js @@ -0,0 +1,30 @@ +var formatter = require( '../../formatter' ), + restbaseProvider = require( '../restProvider' ); + +/** + * Creates an instance of the RESTBase gateway that returns plain text + * + * This gateway differs from the {@link MediaWikiGateway MediaWiki gateway} in + * that it fetches page data from [the RESTBase page summary endpoint][0]. + * + * [0]: https://en.wikipedia.org/api/rest_v1/#!/Page_content/get_page_summary_title + * + * @param {Function} ajax A function with the same signature as `jQuery.ajax` + * @param {Object} config Configuration that affects the major behavior of the + * gateway. + * @param {Number} config.THUMBNAIL_SIZE The length of the major dimension of + * the thumbnail. + * @returns {RESTBaseGateway} + */ +module.exports = function createRESTBaseGateway( ajax, config ) { + return restbaseProvider( ajax, config, parsePlainTextResponse ); +}; + +/** + * Prepare extract + * @param {Object} page Rest response + * @returns {Array} An array of DOM Elements + */ +function parsePlainTextResponse( page ) { + return formatter.formatPlainTextExtract( page.extract, page.title ); +} diff --git a/src/gateway/rest.js b/src/gateway/restProvider.js similarity index 88% rename from src/gateway/rest.js rename to src/gateway/restProvider.js index 7406deb8e..623e1a59c 100644 --- a/src/gateway/rest.js +++ b/src/gateway/restProvider.js @@ -4,11 +4,9 @@ var RESTBASE_ENDPOINT = '/api/rest_v1/page/summary/', RESTBASE_PROFILE = 'https://www.mediawiki.org/wiki/Specs/Summary/1.2.0', - createModel = require( '../preview/model' ).createModel, - plainTextHTMLizer = require( '../formatter' ).htmlize, + modelBuilder = require( '../preview/model' ), mw = window.mediaWiki, $ = jQuery; - /** * @interface RESTBaseGateway * @extends Gateway @@ -29,9 +27,10 @@ var RESTBASE_ENDPOINT = '/api/rest_v1/page/summary/', * gateway. * @param {Number} config.THUMBNAIL_SIZE The length of the major dimension of * the thumbnail. + * @param {Function} extractParser A function that takes response and returns parsed extract * @returns {RESTBaseGateway} */ -module.exports = function createRESTBaseGateway( ajax, config ) { +module.exports = function createRESTBaseGateway( ajax, config, extractParser ) { /** * Fetches page data from [the RESTBase page summary endpoint][0]. @@ -60,17 +59,13 @@ module.exports = function createRESTBaseGateway( ajax, config ) { .then( function ( page ) { result.resolve( - convertPageToModel( page, config.THUMBNAIL_SIZE ) ); + convertPageToModel( page, config.THUMBNAIL_SIZE, extractParser ) ); }, function ( jqXHR ) { if ( jqXHR.status === 404 ) { + result.resolve( - convertPageToModel( { - title: title, - lang: '', - dir: '', - extract: '' - }, 0 ) + modelBuilder.createNullModel( title ) ); } else { result.reject(); @@ -117,7 +112,7 @@ function generateThumbnailData( thumbnail, original, thumbSize ) { // where the thumbnail's extension is .svg.png. filename = lastPart.substr( lastPart.indexOf( 'px-' ) + 3 ); - // Scale the thumbnail's largest dimension. + // Scale the thumbnail's largest dimension. if ( thumbnail.width > thumbnail.height ) { width = thumbSize; height = Math.floor( ( thumbSize / thumbnail.width ) * thumbnail.height ); @@ -148,15 +143,16 @@ function generateThumbnailData( thumbnail, original, thumbSize ) { * @name RESTBaseGateway#convertPageToModel * @param {Object} page * @param {Number} thumbSize + * @param {Function} extractParser * @returns {PreviewModel} */ -function convertPageToModel( page, thumbSize ) { - return createModel( +function convertPageToModel( page, thumbSize, extractParser ) { + return modelBuilder.createModel( page.title, new mw.Title( page.title ).getUrl(), page.lang, page.dir, - plainTextHTMLizer( page.extract, page.title ), + extractParser( page ), page.thumbnail ? generateThumbnailData( page.thumbnail, page.originalimage, thumbSize ) : undefined ); } diff --git a/src/index.js b/src/index.js index 25f1fb8c3..b011658a9 100644 --- a/src/index.js +++ b/src/index.js @@ -8,8 +8,7 @@ var mw = mediaWiki, ReduxThunk = require( 'redux-thunk' ), constants = require( './constants' ), - createRESTBaseGateway = require( './gateway/rest' ), - createMediaWikiApiGateway = require( './gateway/mediawiki' ), + gatewayBuilder = require( './gateway/index' ), createUserSettings = require( './userSettings' ), createPreviewBehavior = require( './previewBehavior' ), createSchema = require( './schema' ), @@ -47,10 +46,16 @@ var mw = mediaWiki, * @return {ext.popups.Gateway} */ function createGateway( config ) { - if ( config.get( 'wgPopupsAPIUseRESTBase' ) ) { - return createRESTBaseGateway( $.ajax, constants ); + switch ( config.get( 'wgPopupsGateway' ) ) { + case 'mwApiPlain': + return gatewayBuilder.mwApiPlain( new mw.Api(), constants ); + case 'restbasePlain': + return gatewayBuilder.restbasePlain( $.ajax, constants ); + case 'restbaseHTML': + return gatewayBuilder.restbaseHTML( $.ajax, constants ); + default: + throw new Error( 'Unknown gateway' ); } - return createMediaWikiApiGateway( new mw.Api(), constants ); } /** diff --git a/src/preview/model.js b/src/preview/model.js index 608ce1cd0..42aca7aa0 100644 --- a/src/preview/model.js +++ b/src/preview/model.js @@ -2,19 +2,15 @@ * @module preview/model */ +/** + * @constant {String} + */ var TYPE_GENERIC = 'generic', +/** + * @constant {String} + */ TYPE_PAGE = 'page'; -/** - * @constant {String} - */ -exports.TYPE_GENERIC = TYPE_GENERIC; - -/** - * @constant {String} - */ -exports.TYPE_PAGE = TYPE_PAGE; - /** * @typedef {Object} PreviewModel * @property {String} title @@ -24,11 +20,17 @@ exports.TYPE_PAGE = TYPE_PAGE; * @property {?Array} extract `undefined` if the extract isn't * viable, e.g. if it's empty after having ellipsis and parentheticals * removed - * @property {String} type Either "EXTRACT" or "GENERIC" + * @property {String} type Either "extract" or "generic" * @property {?Object} thumbnail * * @global */ +module.exports = { + TYPE_GENERIC: TYPE_GENERIC, + TYPE_PAGE: TYPE_PAGE, + createModel: createModel, + createNullModel: createNullModel +}; /** * Creates a preview model. @@ -41,7 +43,7 @@ exports.TYPE_PAGE = TYPE_PAGE; * @param {?Object} thumbnail * @return {PreviewModel} */ -exports.createModel = function createModel( +function createModel( title, url, languageCode, @@ -60,7 +62,17 @@ exports.createModel = function createModel( type: processedExtract === undefined ? TYPE_GENERIC : TYPE_PAGE, thumbnail: thumbnail }; -}; +} + +/** + * Creates an empty preview model. + * + * @param {String} title + * @return {PreviewModel} + */ +function createNullModel( title ) { + return createModel( title, '', '', '', [], '' ); +} /** * Processes the extract returned by the TextExtracts MediaWiki API query @@ -69,11 +81,11 @@ exports.createModel = function createModel( * If the extract is `undefined`, `null`, or empty, then `undefined` is * returned. * - * @param {?Array} extract - * @return {?String} + * @param {Array|undefined|null} extract + * @return {Array|undefined} Array when extract is an not empty array, undefined otherwise */ function processExtract( extract ) { - if ( extract === undefined || extract.length === 0 ) { + if ( extract === undefined || extract === null || extract.length === 0 ) { return undefined; } return extract; diff --git a/tests/node-qunit/formatter.test.js b/tests/node-qunit/formatter.test.js index 94116ca5c..a188e7f7a 100644 --- a/tests/node-qunit/formatter.test.js +++ b/tests/node-qunit/formatter.test.js @@ -55,7 +55,7 @@ QUnit.test( 'Title is bold', function ( assert ) { function test( extract, title, expected, msg ) { var $div = $( '
' ).append( - formatter.htmlize( extract, title ) + formatter.formatPlainTextExtract( extract, title ) ); assert.equal( $div.html(), expected, msg ); } @@ -86,7 +86,7 @@ QUnit.test( 'it strips ellipsis and parentheticals', function ( assert ) { testCase = cases[ i ]; $div = $( '
' ).append( - formatter.htmlize( testCase[ 0 ], 'Test' ) + formatter.formatPlainTextExtract( testCase[ 0 ], 'Test' ) ); assert.equal( $div.html(), testCase[ 1 ] ); diff --git a/tests/node-qunit/gateway/mediawiki.test.js b/tests/node-qunit/gateway/plain/mediawiki.test.js similarity index 97% rename from tests/node-qunit/gateway/mediawiki.test.js rename to tests/node-qunit/gateway/plain/mediawiki.test.js index fabdddb28..f4f42d277 100644 --- a/tests/node-qunit/gateway/mediawiki.test.js +++ b/tests/node-qunit/gateway/plain/mediawiki.test.js @@ -1,5 +1,5 @@ var createModel = require( '../../../src/preview/model' ).createModel, - createMediaWikiApiGateway = require( '../../../src/gateway/mediawiki' ), + createMediaWikiApiGateway = require( '../../../src/gateway/plain/mediawiki' ), DEFAULT_CONSTANTS = { THUMBNAIL_SIZE: 300, EXTRACT_LENGTH: 525 @@ -146,7 +146,7 @@ QUnit.test( 'MediaWiki API gateway is correctly converting the page data to a mo page = gateway.extractPageFromResponse( MEDIAWIKI_API_RESPONSE ); assert.deepEqual( - gateway.convertPageToModel( gateway.htmlize( page ) ), + gateway.convertPageToModel( gateway.formatPlainTextExtract( page ) ), MEDIAWIKI_API_RESPONSE_PREVIEW_MODEL ); } ); diff --git a/tests/node-qunit/gateway/rest.test.js b/tests/node-qunit/gateway/restProvider.test.js similarity index 87% rename from tests/node-qunit/gateway/rest.test.js rename to tests/node-qunit/gateway/restProvider.test.js index 7c4ab0ad4..b1350c58a 100644 --- a/tests/node-qunit/gateway/rest.test.js +++ b/tests/node-qunit/gateway/restProvider.test.js @@ -1,5 +1,5 @@ var createModel = require( '../../../src/preview/model' ).createModel, - createRESTBaseGateway = require( '../../../src/gateway/rest' ), + createRESTBaseGateway = require( '../../../src/gateway/restProvider' ), DEFAULT_CONSTANTS = { THUMBNAIL_SIZE: 512 }, @@ -97,7 +97,7 @@ var createModel = require( '../../../src/preview/model' ).createModel, 'url/Barack Obama', // Generated in the stub below 'en', 'ltr', - [ document.createTextNode( 'Barack Hussein Obama II born August 4, 1961) ' ) ], + '!Barack Hussein Obama II born August 4, 1961) ...!', { source: 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/8d/President_Barack_Obama.jpg/409px-President_Barack_Obama.jpg', width: 409, @@ -105,19 +105,17 @@ var createModel = require( '../../../src/preview/model' ).createModel, } ); +function provideParsedExtract( page ) { + return '!' + page.extract + '!'; +} + QUnit.module( 'gateway/rest', { beforeEach: function () { - window.mediaWiki.RegExp = { - escape: this.sandbox.spy( function ( str ) { - return str.replace( /([\\{}()|.?*+\-\^$\[\]])/g, '\\$1' ); - } ) - }; window.mediaWiki.Title = function ( title ) { this.getUrl = function () { return 'url/' + title; }; }; }, afterEach: function () { - window.mediaWiki.RegExp = null; window.mediaWiki.Title = null; } } ); @@ -134,15 +132,22 @@ QUnit.test( 'RESTBase gateway is called with correct arguments', function ( asse }; gateway.fetch( 'Test Title' ); - assert.deepEqual( getSpy.getCall( 0 ).args[ 0 ], expectedOptions, 'options' ); } ); +QUnit.test( 'RESTBase provider uses extract parser', function ( assert ) { + var getSpy = this.sandbox.spy(), + gateway = createRESTBaseGateway(); + + gateway.convertPageToModel( RESTBASE_RESPONSE, 512, getSpy ); + assert.deepEqual( getSpy.getCall( 0 ).args[ 0 ], RESTBASE_RESPONSE ); +} ); + QUnit.test( 'RESTBase gateway is correctly converting the page data to a model ', function ( assert ) { var gateway = createRESTBaseGateway(); assert.deepEqual( - gateway.convertPageToModel( RESTBASE_RESPONSE, 512 ), + gateway.convertPageToModel( RESTBASE_RESPONSE, 512, provideParsedExtract ), RESTBASE_RESPONSE_PREVIEW_MODEL ); } ); @@ -151,7 +156,7 @@ QUnit.test( 'RESTBase gateway doesn\'t stretch thumbnails', function ( assert ) var model, gateway = createRESTBaseGateway(); - model = gateway.convertPageToModel( RESTBASE_RESPONSE, 2000 ); + model = gateway.convertPageToModel( RESTBASE_RESPONSE, 2000, provideParsedExtract ); assert.deepEqual( model.thumbnail, @@ -160,7 +165,7 @@ QUnit.test( 'RESTBase gateway doesn\'t stretch thumbnails', function ( assert ) ); // --- - model = gateway.convertPageToModel( RESTBASE_RESPONSE, RESTBASE_RESPONSE.originalimage.height ); + model = gateway.convertPageToModel( RESTBASE_RESPONSE, RESTBASE_RESPONSE.originalimage.height, provideParsedExtract ); assert.deepEqual( model.thumbnail, @@ -169,7 +174,7 @@ QUnit.test( 'RESTBase gateway doesn\'t stretch thumbnails', function ( assert ) ); // --- - model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITH_SMALL_IMAGE, 320 ); + model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITH_SMALL_IMAGE, 320, provideParsedExtract ); assert.deepEqual( model.thumbnail, @@ -178,7 +183,7 @@ QUnit.test( 'RESTBase gateway doesn\'t stretch thumbnails', function ( assert ) ); // --- - model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITH_LANDSCAPE_IMAGE, 640 ); + model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITH_LANDSCAPE_IMAGE, 640, provideParsedExtract ); assert.deepEqual( model.thumbnail, @@ -200,7 +205,7 @@ QUnit.test( 'RESTBase gateway handles awkwardly thumbnails', function ( assert ) response.thumbnail = Object.assign( {}, RESTBASE_RESPONSE.thumbnail ); response.thumbnail.source = 'http://foo.bar/baz/Qux-320px-Quux.png/800px-Qux-320px-Quux.png'; - model = gateway.convertPageToModel( response, 500 ); + model = gateway.convertPageToModel( response, 500, provideParsedExtract ); assert.deepEqual( model.thumbnail.source, @@ -213,7 +218,7 @@ QUnit.test( 'RESTBase gateway stretches SVGs', function ( assert ) { var model, gateway = createRESTBaseGateway(); - model = gateway.convertPageToModel( SVG_RESTBASE_RESPONSE, 2000 ); + model = gateway.convertPageToModel( SVG_RESTBASE_RESPONSE, 2000, provideParsedExtract ); assert.equal( model.thumbnail.source, @@ -238,7 +243,7 @@ QUnit.test( 'RESTBase gateway handles the API failure', function ( assert ) { QUnit.test( 'RESTBase gateway does not treat a 404 as a failure', function ( assert ) { var deferred = $.Deferred(), api = this.sandbox.stub().returns( deferred.reject( { status: 404 } ).promise() ), - gateway = createRESTBaseGateway( api ), + gateway = createRESTBaseGateway( api, { THUMBNAIL_SIZE: 200 }, provideParsedExtract ), done = assert.async( 1 ); gateway.getPageSummary( 'Test Title' ).done( function () { @@ -251,7 +256,7 @@ QUnit.test( 'RESTBase gateway returns the correct data ', function ( assert ) { var api = this.sandbox.stub().returns( $.Deferred().resolve( RESTBASE_RESPONSE ).promise() ), - gateway = createRESTBaseGateway( api, DEFAULT_CONSTANTS ), + gateway = createRESTBaseGateway( api, DEFAULT_CONSTANTS, provideParsedExtract ), done = assert.async( 1 ); gateway.getPageSummary( 'Test Title' ).done( function ( result ) { @@ -263,7 +268,7 @@ QUnit.test( 'RESTBase gateway returns the correct data ', function ( assert ) { QUnit.test( 'RESTBase gateway handles missing images ', function ( assert ) { var model, gateway = createRESTBaseGateway(); - model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITHOUT_IMAGE, 300 ); + model = gateway.convertPageToModel( RESTBASE_RESPONSE_WITHOUT_IMAGE, 300, provideParsedExtract ); assert.equal( model.originalimage, @@ -283,7 +288,7 @@ QUnit.test( 'RESTBase gateway handles missing pages ', function ( assert ) { api = this.sandbox.stub().returns( $.Deferred().reject( response ).promise() ), - gateway = createRESTBaseGateway( api, DEFAULT_CONSTANTS ), + gateway = createRESTBaseGateway( api, DEFAULT_CONSTANTS, provideParsedExtract ), done = assert.async( 1 ); gateway.getPageSummary( 'Missing Page' ).fail( function () { diff --git a/tests/phpunit/PopupsHooksTest.php b/tests/phpunit/PopupsHooksTest.php index 6dc50fdf8..0e4cdcdc6 100644 --- a/tests/phpunit/PopupsHooksTest.php +++ b/tests/phpunit/PopupsHooksTest.php @@ -178,7 +178,7 @@ class PopupsHooksTest extends MediaWikiTestCase { $config = [ 'wgPopupsSchemaSamplingRate' => 10, 'wgPopupsBetaFeature' => true, - 'wgPopupsAPIUseRESTBase' => false, + 'wgPopupsGateway' => 'mwApiPlain', 'wgPopupsAnonsEnabledSamplingRate' => 0.9, 'wgPopupsStatsvSamplingRate' => 0 ];