BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/307691
Change subject: Use summary endpoint data for random inside aggregated endpoint ...................................................................... Use summary endpoint data for random inside aggregated endpoint Before it was using the items array to hold the title. Now the title property and the other summary properties are top level properties inside the random portion of the aggregated feed. Bumped the subminor aggregatedFeed version to signify this small change in output format. I believe the random part is not being used yet by any client. (<-- famous last words) Bug: T143804 Change-Id: I736d2f7f334fea1df0cedf2840f5c40673c9ba4f --- M lib/mobile-util.js M routes/aggregated.js M test/features/aggregated/aggregated.js 3 files changed, 13 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mobileapps refs/changes/91/307691/1 diff --git a/lib/mobile-util.js b/lib/mobile-util.js index 74b1cbe..de1475b 100644 --- a/lib/mobile-util.js +++ b/lib/mobile-util.js @@ -10,7 +10,7 @@ mobileSections: { name: 'mobile-sections', version: '0.8.0' }, definition: { name: 'definition', version: '0.7.0' }, - aggregatedFeed: { name: 'aggregated-feed', version: '0.5.0' }, + aggregatedFeed: { name: 'aggregated-feed', version: '0.5.1' }, random: { name: 'random', version: '0.6.0' }, unpublished: { name: 'unpublished', version: '0.0.0' } diff --git a/routes/aggregated.js b/routes/aggregated.js index afa3719..f30e044 100644 --- a/routes/aggregated.js +++ b/routes/aggregated.js @@ -41,7 +41,7 @@ }) .then(function (response) { var aggregate = { tfa: response.tfa.payload, - random: mwapi.buildTitleResponse(response.random.payload), + random: mwapi.buildSummaryResponse(response.random.payload, response.random.payload.title), mostread: response.mostread.payload, news: response.news.payload, image: response.image.payload diff --git a/test/features/aggregated/aggregated.js b/test/features/aggregated/aggregated.js index dec2950..0111ec6 100644 --- a/test/features/aggregated/aggregated.js +++ b/test/features/aggregated/aggregated.js @@ -69,4 +69,15 @@ assert.deepEqual(image.description.lang, 'en'); }); }); + + it('random inside the aggregated endpoint response has expected properties', function() { + return preq.get({ uri: server.config.uri + 'en.wikipedia.org/v1/feed/featured/2016/07/05' }) + .then(function(res) { + var random = res.body.random; + assert.equal(res.status, 200); + assert.ok(random, 'Should have random page entry'); + assert.ok(random.hasOwnProperty('title')); + // other properties are optional and not guaranteed + }); + }); }); -- To view, visit https://gerrit.wikimedia.org/r/307691 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I736d2f7f334fea1df0cedf2840f5c40673c9ba4f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/mobileapps Gerrit-Branch: master Gerrit-Owner: BearND <bsitzm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits