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

revert: sync hooks

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-04-28 15:00:43 -04:00
parent 33d91fdef8
commit 5fe97b9c2e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/hooks.js
View File

@@ -137,9 +137,14 @@ async function fireFilterHook(hook, hookList, params) {
payload => resolve(payload), payload => resolve(payload),
err => reject(err) err => reject(err)
); );
return;
}
if (returned) {
resolve(returned);
} }
}); });
} }
for (const hookObj of hookList) { for (const hookObj of hookList) {
// eslint-disable-next-line // eslint-disable-next-line
params = await fireMethod(hookObj, params); params = await fireMethod(hookObj, params);

9
test/plugins.js
View File

@@ -47,7 +47,7 @@ describe('Plugins', () => {
}); });
}); });
it('should register and fire a filter hook having 2 methods, one returning a promise, one calling the callback', async () => { it('should register and fire a filter hook having 3 methods, one returning a promise, one calling the callback and one just returning', async () => {
function method1(data, callback) { function method1(data, callback) {
data.foo += 1; data.foo += 1;
callback(null, data); callback(null, data);
@@ -58,12 +58,17 @@ describe('Plugins', () => {
resolve(data); resolve(data);
}); });
} }
function method3(data) {
data.foo += 1;
return data;
}
plugins.hooks.register('test-plugin', { hook: 'filter:test.hook2', method: method1 }); plugins.hooks.register('test-plugin', { hook: 'filter:test.hook2', method: method1 });
plugins.hooks.register('test-plugin', { hook: 'filter:test.hook2', method: method2 }); plugins.hooks.register('test-plugin', { hook: 'filter:test.hook2', method: method2 });
plugins.hooks.register('test-plugin', { hook: 'filter:test.hook2', method: method3 });
const data = await plugins.hooks.fire('filter:test.hook2', { foo: 1 }); const data = await plugins.hooks.fire('filter:test.hook2', { foo: 1 });
assert.strictEqual(data.foo, 7); assert.strictEqual(data.foo, 8);
}); });
it('should register and fire a filter hook that returns a promise that gets rejected', (done) => { it('should register and fire a filter hook that returns a promise that gets rejected', (done) => {