jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/394440 )
Change subject: Update: exclude Canada from iOS countries list
......................................................................
Update: exclude Canada from iOS countries list
Bug: T181743
Change-Id: If21918d95a3d97fba7525faa74951fac26c22517
---
M etc/feed/announcements.js
M lib/feed/announcements.js
M test/lib/feed/announcements.js
3 files changed, 44 insertions(+), 11 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/etc/feed/announcements.js b/etc/feed/announcements.js
index dbe1743..c5c436c 100644
--- a/etc/feed/announcements.js
+++ b/etc/feed/announcements.js
@@ -20,7 +20,7 @@
const disclaimerHtml
= 'By submitting, you are agreeing to our <a
href="https://wikimediafoundation.org/wiki/Donor_policy/en";>donor privacy
policy</a>.';
-const countryVariants = [ {
+const androidCountryVariants = [ {
countryCode: 'US',
country: 'the U.S.',
currency: '$',
@@ -41,6 +41,38 @@
}, {
countryCode: 'CA',
country: 'Canada',
+ currency: '$',
+ average: 15,
+ coffee: 3
+}, {
+ countryCode: 'NZ',
+ country: 'New Zealand',
+ currency: '$',
+ average: 15,
+ coffee: 3
+}, {
+ countryCode: 'IE',
+ country: 'Ireland',
+ currency: '€',
+ average: 10,
+ coffee: 2
+}];
+
+const iOSCountryVariants = [ {
+ countryCode: 'US',
+ country: 'the U.S.',
+ currency: '$',
+ average: 15,
+ coffee: 3
+}, {
+ countryCode: 'GB',
+ country: 'the UK',
+ currency: '£',
+ average: 10,
+ coffee: 2
+}, {
+ countryCode: 'AU',
+ country: 'Australia',
currency: '$',
average: 15,
coffee: 3
@@ -84,6 +116,7 @@
// imageUrl,
buttonLabel,
disclaimerHtml,
- countryVariants,
+ androidCountryVariants,
+ iOSCountryVariants,
buildBaseBodyText
};
diff --git a/lib/feed/announcements.js b/lib/feed/announcements.js
index 08fb116..14f0deb 100644
--- a/lib/feed/announcements.js
+++ b/lib/feed/announcements.js
@@ -66,10 +66,10 @@
};
function getActiveAnnouncements() {
- const results = [];
- config.countryVariants.forEach(variant =>
results.push(buildAndroidAnnouncement(variant)));
- config.countryVariants.forEach(variant =>
results.push(buildIosAnnouncement(variant)));
- return results;
+ const res = [];
+ config.androidCountryVariants.forEach(variant =>
res.push(buildAndroidAnnouncement(variant)));
+ config.iOSCountryVariants.forEach(variant =>
res.push(buildIosAnnouncement(variant)));
+ return res;
}
function isActiveWiki(domain) {
diff --git a/test/lib/feed/announcements.js b/test/lib/feed/announcements.js
index 2a5019f..d235957 100644
--- a/test/lib/feed/announcements.js
+++ b/test/lib/feed/announcements.js
@@ -16,7 +16,7 @@
it('should return some announcements for active wiki', () => {
const res = mut.getAnnouncements(activeAnnouncementDomain);
- assert.ok(res.announce.length === 12);
+ assert.ok(res.announce.length === 11);
assert.equal(res.announce[0].id, 'EN1217FUNDRAISINGANDROIDUS');
assert.equal(res.announce[1].id, 'EN1217FUNDRAISINGANDROIDGB');
assert.equal(res.announce[2].id, 'EN1217FUNDRAISINGANDROIDAU');
@@ -41,7 +41,7 @@
const doc = domino.createDocument();
// destructure 'id', 'text' and 'action.title' from the iOS
announcement
const { text, action: { title } }
- = mut.testing.buildIosAnnouncement(config.countryVariants[0]);
+ = mut.testing.buildIosAnnouncement(config.iOSCountryVariants[0]);
const fieldsToCheck = { text, title };
for (const textOnlyFieldName of Object.keys(fieldsToCheck)) {
const textToCheck = fieldsToCheck[textOnlyFieldName];
@@ -58,7 +58,7 @@
it('should deliver HTML in certain Android announcements fields', () => {
const doc = domino.createDocument();
- const { text } =
mut.testing.buildAndroidAnnouncement(config.countryVariants[0]);
+ const { text } =
mut.testing.buildAndroidAnnouncement(config.androidCountryVariants[0]);
const fieldsToCheck = { text };
for (const textOnlyFieldName of Object.keys(fieldsToCheck)) {
const textToCheck = fieldsToCheck[textOnlyFieldName];
@@ -74,13 +74,13 @@
});
it('caption_HTML on iOS should be inside a paragraph', () => {
- const { caption_HTML } =
mut.testing.buildIosAnnouncement(config.countryVariants[0]);
+ const { caption_HTML } =
mut.testing.buildIosAnnouncement(config.iOSCountryVariants[0]);
const doc = domino.createDocument(caption_HTML);
assert.deepEqual(doc.body.firstElementChild.tagName, 'P');
});
it('caption_HTML on Android should not be inside a paragraph', () => {
- const { caption_HTML } =
mut.testing.buildAndroidAnnouncement(config.countryVariants[0]);
+ const { caption_HTML } =
mut.testing.buildAndroidAnnouncement(config.androidCountryVariants[0]); //
eslint-disable-line max-len
const doc = domino.createDocument(caption_HTML);
assert.notDeepEqual(doc.body.firstElementChild.tagName, 'P');
});
--
To view, visit https://gerrit.wikimedia.org/r/394440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If21918d95a3d97fba7525faa74951fac26c22517
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
