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

fix: deprecated emailer hook

Browse Source
This commit is contained in:
Julian Lam
2023-12-05 10:41:23 -05:00
parent 2c1c4dfe41
commit 565ca3cc3b
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api.js
View File

@@ -175,7 +175,7 @@ describe('API', async () => {
after(async () => { after(async () => {
plugins.hooks.unregister('core', 'filter:search.query', dummySearchHook); plugins.hooks.unregister('core', 'filter:search.query', dummySearchHook);
plugins.hooks.unregister('emailer-test', 'filter:email.send'); plugins.hooks.unregister('emailer-test', 'static:email.send');
}); });
async function setupData() { async function setupData() {
@@ -306,7 +306,7 @@ describe('API', async () => {
}); });
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('emailer-test', { plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });

4
test/authentication.js
View File

@@ -26,7 +26,7 @@ describe('authentication', () => {
before((done) => { before((done) => {
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('authentication-test', { plugins.hooks.register('authentication-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
@@ -39,7 +39,7 @@ describe('authentication', () => {
}); });
after(() => { after(() => {
plugins.hooks.unregister('authentication-test', 'filter:email.send'); plugins.hooks.unregister('authentication-test', 'static:email.send');
}); });
it('should allow login with email for uid 1', async () => { it('should allow login with email for uid 1', async () => {

4
test/controllers.js
View File

@@ -346,7 +346,7 @@ describe('Controllers', () => {
before(async () => { before(async () => {
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('emailer-test', { plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
@@ -361,7 +361,7 @@ describe('Controllers', () => {
after(() => { after(() => {
meta.config.requireEmailAddress = 0; meta.config.requireEmailAddress = 0;
plugins.hooks.unregister('emailer-test', 'filter:email.send'); plugins.hooks.unregister('emailer-test', 'static:email.send');
}); });
it('email interstitial should still apply if empty email entered and requireEmailAddress is enabled', async () => { it('email interstitial should still apply if empty email entered and requireEmailAddress is enabled', async () => {

16
test/emailer.js
View File

@@ -58,14 +58,14 @@ describe('emailer', () => {
}; };
Plugins.hooks.register('emailer-test', { Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method, method,
}); });
Emailer.sendToEmail(template, email, language, params, (err) => { Emailer.sendToEmail(template, email, language, params, (err) => {
assert.equal(err, error); assert.equal(err, error);
Plugins.hooks.unregister('emailer-test', 'filter:email.send', method); Plugins.hooks.unregister('emailer-test', 'static:email.send', method);
done(); done();
}); });
}); });
@@ -157,14 +157,14 @@ describe('emailer', () => {
assert(false); // if thrown, email was sent assert(false); // if thrown, email was sent
}; };
Plugins.hooks.register('emailer-test', { Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method, method,
}); });
await user.bans.ban(recipientUid); await user.bans.ban(recipientUid);
await Emailer.send('test', recipientUid, {}); await Emailer.send('test', recipientUid, {});
Plugins.hooks.unregister('emailer-test', 'filter:email.send', method); Plugins.hooks.unregister('emailer-test', 'static:email.send', method);
}); });
it('should return true if the template is "banned"', async () => { it('should return true if the template is "banned"', async () => {
@@ -172,12 +172,12 @@ describe('emailer', () => {
assert(true); // if thrown, email was sent assert(true); // if thrown, email was sent
}; };
Plugins.hooks.register('emailer-test', { Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method, method,
}); });
await Emailer.send('banned', recipientUid, {}); await Emailer.send('banned', recipientUid, {});
Plugins.hooks.unregister('emailer-test', 'filter:email.send', method); Plugins.hooks.unregister('emailer-test', 'static:email.send', method);
}); });
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 () => {
@@ -185,7 +185,7 @@ describe('emailer', () => {
assert(true); // if thrown, email was sent assert(true); // if thrown, email was sent
}; };
Plugins.hooks.register('emailer-test', { Plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method, method,
}); });
@@ -194,7 +194,7 @@ describe('emailer', () => {
meta.config.sendEmailToBanned = 0; meta.config.sendEmailToBanned = 0;
await user.bans.unban(recipientUid); await user.bans.unban(recipientUid);
Plugins.hooks.unregister('emailer-test', 'filter:email.send', method); Plugins.hooks.unregister('emailer-test', 'static:email.send', method);
}); });
}); });
}); });

4
test/flags.js
View File

@@ -35,7 +35,7 @@ describe('Flags', () => {
const dummyEmailerHook = async (data) => {}; const dummyEmailerHook = async (data) => {};
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('flags-test', { plugins.hooks.register('flags-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
@@ -70,7 +70,7 @@ describe('Flags', () => {
}); });
after(() => { after(() => {
plugins.hooks.unregister('flags-test', 'filter:email.send'); plugins.hooks.unregister('flags-test', 'static:email.send');
}); });
describe('.create()', () => { describe('.create()', () => {

4
test/socket.io.js
View File

@@ -236,12 +236,12 @@ describe('socket.io', () => {
before(() => { before(() => {
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('emailer-test', { plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
}); });
after(() => { after(() => {
plugins.hooks.unregister('emailer-test', 'filter:email.send'); plugins.hooks.unregister('emailer-test', 'static:email.send');
}); });
it('should validate emails', (done) => { it('should validate emails', (done) => {

4
test/user.js
View File

@@ -38,7 +38,7 @@ describe('User', () => {
before((done) => { before((done) => {
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('emailer-test', { plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
@@ -56,7 +56,7 @@ describe('User', () => {
}); });
}); });
after(() => { after(() => {
plugins.hooks.unregister('emailer-test', 'filter:email.send'); plugins.hooks.unregister('emailer-test', 'static:email.send');
}); });
beforeEach(() => { beforeEach(() => {

4
test/user/emails.js
View File

@@ -23,7 +23,7 @@ describe('email confirmation (library methods)', () => {
before(() => { before(() => {
// Attach an emailer hook so related requests do not error // Attach an emailer hook so related requests do not error
plugins.hooks.register('emailer-test', { plugins.hooks.register('emailer-test', {
hook: 'filter:email.send', hook: 'static:email.send',
method: dummyEmailerHook, method: dummyEmailerHook,
}); });
}); });
@@ -36,7 +36,7 @@ describe('email confirmation (library methods)', () => {
}); });
after(async () => { after(async () => {
plugins.hooks.unregister('emailer-test', 'filter:email.send'); plugins.hooks.unregister('emailer-test', 'static:email.send');
}); });
describe('isValidationPending', () => { describe('isValidationPending', () => {