Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: email ban tests

Browse Source
This commit is contained in:
Julian Lam
2022-01-28 15:41:22 -05:00
parent e25c0313d1
commit dee9cca3c8
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/emailer.js
View File

@@ -230,7 +230,7 @@ Emailer.send = async (template, uid, params) => {
if (!meta.config.sendEmailToBanned && template !== 'banned') { if (!meta.config.sendEmailToBanned && template !== 'banned') {
if (userData.banned) { if (userData.banned) {
winston.warn(`[emailer/send] User ${userData.username} (uid: ${uid}) is banned; not sending email due to system config.`); winston.warn(`[emailer/send] User ${userData.username} (uid: ${uid}) is banned; not sending email due to system config.`);
return false; return;
} }
} }

49
test/emailer.js
View File

@@ -144,39 +144,52 @@ describe('emailer', () => {
}); });
describe('emailer.send()', () => { describe('emailer.send()', () => {
let senderUid;
let recipientUid; let recipientUid;
before(async () => { before(async () => {
Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send',
method: async () => {}, // noop
});
senderUid = await user.create({ username: 'sender' });
recipientUid = await user.create({ username: 'recipient', email: 'test@example.org' }); recipientUid = await user.create({ username: 'recipient', email: 'test@example.org' });
await user.email.confirmByUid(recipientUid); await user.email.confirmByUid(recipientUid);
}); });
it('should return false on attempted email send to a banned user', async () => { it('should not send email to a banned user', async () => {
Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send',
method: async () => {
assert(false); // if thrown, email was sent
},
});
await user.bans.ban(recipientUid); await user.bans.ban(recipientUid);
const success = await Emailer.send('test', recipientUid, {}); await Emailer.send('test', recipientUid, {});
assert.strictEqual(success, false);
Plugins.hooks.unregister('emailer-test', 'filter:email.send');
}); });
it('should return true if the template is "banned"', async () => { it('should return true if the template is "banned"', async () => {
const success = await Emailer.send('banned', recipientUid, {}); Plugins.hooks.register('emailer-test', {
assert.strictEqual(success, true); hook: 'filter:email.send',
method: async () => {
assert(true); // if thrown, email was sent
},
});
await Emailer.send('banned', recipientUid, {});
Plugins.hooks.unregister('emailer-test', 'filter:email.send');
}); });
it('should return true if system settings allow sending to banned users', async () => { it('should return true if system settings allow sending to banned users', async () => {
meta.config.sendEmailToBanned = 1; Plugins.hooks.register('emailer-test', {
const success = await Emailer.send('test', recipientUid, {}); hook: 'filter:email.send',
assert.strictEqual(success, true); method: async () => {
meta.config.sendEmailToBanned = 0; assert(true); // if thrown, email was sent
}); },
});
meta.config.sendEmailToBanned = 1;
await Emailer.send('test', recipientUid, {});
meta.config.sendEmailToBanned = 0;
await user.bans.unban(recipientUid);
after(() => {
Plugins.hooks.unregister('emailer-test', 'filter:email.send'); Plugins.hooks.unregister('emailer-test', 'filter:email.send');
}); });
}); });