mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 08:36:12 +01:00
fix: email ban tests
This commit is contained in:
@@ -230,7 +230,7 @@ Emailer.send = async (template, uid, params) => {
|
||||
if (!meta.config.sendEmailToBanned && template !== 'banned') {
|
||||
if (userData.banned) {
|
||||
winston.warn(`[emailer/send] User ${userData.username} (uid: ${uid}) is banned; not sending email due to system config.`);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -144,39 +144,52 @@ describe('emailer', () => {
|
||||
});
|
||||
|
||||
describe('emailer.send()', () => {
|
||||
let senderUid;
|
||||
let recipientUid;
|
||||
|
||||
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' });
|
||||
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);
|
||||
const success = await Emailer.send('test', recipientUid, {});
|
||||
assert.strictEqual(success, false);
|
||||
await Emailer.send('test', recipientUid, {});
|
||||
|
||||
Plugins.hooks.unregister('emailer-test', 'filter:email.send');
|
||||
});
|
||||
|
||||
it('should return true if the template is "banned"', async () => {
|
||||
const success = await Emailer.send('banned', recipientUid, {});
|
||||
assert.strictEqual(success, true);
|
||||
Plugins.hooks.register('emailer-test', {
|
||||
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 () => {
|
||||
meta.config.sendEmailToBanned = 1;
|
||||
const success = await Emailer.send('test', recipientUid, {});
|
||||
assert.strictEqual(success, true);
|
||||
meta.config.sendEmailToBanned = 0;
|
||||
});
|
||||
Plugins.hooks.register('emailer-test', {
|
||||
hook: 'filter:email.send',
|
||||
method: async () => {
|
||||
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');
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user