jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/380856 )
Change subject: Redirects return 204 inside MCS
......................................................................
Redirects return 204 inside MCS
These will be handled upstream in RestBase.
To avoid confusion send a 204 when no intro is available and thus
no summary is available.
Bug: T176517
Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6
---
M routes/mobile-sections.js
M test/features/mobile-sections-lead/previewHtml.js
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
Zoranzoki21: Looks good to me, but someone else must approve
diff --git a/routes/mobile-sections.js b/routes/mobile-sections.js
index a7239e3..e37c35e 100644
--- a/routes/mobile-sections.js
+++ b/routes/mobile-sections.js
@@ -385,6 +385,11 @@
code = 204;
} else if (lead.intro) {
summary = transforms.summarize(lead.intro);
+ } else {
+ // If the lead introduction is empty we should consider it
+ // a placeholder e.g. redirect page. To avoid sending an empty
+ // summary 204. (T176517)
+ code = 204;
}
return Object.assign({
code,
diff --git a/test/features/mobile-sections-lead/previewHtml.js
b/test/features/mobile-sections-lead/previewHtml.js
index c34a087..023f0ab 100644
--- a/test/features/mobile-sections-lead/previewHtml.js
+++ b/test/features/mobile-sections-lead/previewHtml.js
@@ -44,11 +44,11 @@
});
});
- it('200/302 for pages that are redirects', () => {
+ it('204 for pages that are redirects', () => {
const uri =
`${server.config.uri}en.wikipedia.org/v1/page/summary/Barack`;
return preq.get({ uri })
.then((res) => {
- assert.ok(res.status === 200, 'Redirect pages are resolved to
200 via a 302');
+ assert.ok(res.status === 204, 'Redirect pages are resolved to
204');
});
});
});
--
To view, visit https://gerrit.wikimedia.org/r/380856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42dc94babefdfa4aa0a6d97c3b412868df72e0e6
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Ppchelko <ppche...@wikimedia.org>
Gerrit-Reviewer: Zoranzoki21 <dori.g...@orion.rs>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
