jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397622 )
Change subject: Summary: Send empty extracts, not 204, for main pages
......................................................................
Summary: Send empty extracts, not 204, for main pages
I believe this was added based on a misreading of the earlier patch for
handling redirects. Instead, main pages should be handled in the general
case of pages with no lead intros, which is to return a valid summary
object with empty extract fields.
This is subject to confirmation from Reading Web but I'm putting in the
patch now since it's nearly deployment time.
Bug: T177431
Change-Id: I3b5448369bd07580842188305d2c246b9f78b111
---
M lib/mobile-util.js
M test/features/summary/pagecontent.js
2 files changed, 11 insertions(+), 5 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mobile-util.js b/lib/mobile-util.js
index acbccc8..91649f7 100644
--- a/lib/mobile-util.js
+++ b/lib/mobile-util.js
@@ -200,7 +200,6 @@
const meta = pageData.meta;
const isContentModelWikitext = meta.contentmodel === 'wikitext';
const isWhiteListedNamespace =
mUtil.SUMMARY_NS_WHITELIST.includes(meta.ns);
- const isMainPage = meta.mainpage;
const isRedirect = meta.redirect;
if (!isContentModelWikitext) {
@@ -208,10 +207,6 @@
}
if (!isWhiteListedNamespace) {
- return { code: 204 };
- }
-
- if (isMainPage) {
return { code: 204 };
}
diff --git a/test/features/summary/pagecontent.js
b/test/features/summary/pagecontent.js
index 4366281..82a6cd8 100644
--- a/test/features/summary/pagecontent.js
+++ b/test/features/summary/pagecontent.js
@@ -46,6 +46,17 @@
});
});
+ it('empty summary (not 204) should be sent for project main page', () => {
+ const uri = localUri('Main_Page');
+ return preq.get({ uri })
+ .then((res) => {
+ assert.deepEqual(res.status, 200);
+ assert.deepEqual(res.body.type, 'standard');
+ assert.deepEqual(res.body.extract, '', 'should send empty
plaintext extract');
+ assert.deepEqual(res.body.extract_html, '', 'should send empty
html extract');
+ });
+ });
+
it('204 should be returned for redirect page', () => {
const uri = localUri('Barack');
return preq.get({ uri })
--
To view, visit https://gerrit.wikimedia.org/r/397622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b5448369bd07580842188305d2c246b9f78b111
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
