Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-16 03:20:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-02-26 16:32:45 -05:00
parent 77a3efb43c 22cd80b9db
commit 3d83a1752e
226 changed files with 3214 additions and 2834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/database/sets.js
View File

@@ -30,6 +30,19 @@ describe('Set methods', () => {
assert.deepStrictEqual(members, []);
assert(!exists);
});
it('should not error with parallel adds', async () => {
await Promise.all([
db.setAdd('parallelset', 1),
db.setAdd('parallelset', 2),
db.setAdd('parallelset', 3),
]);
const members = await db.getSetMembers('parallelset');
assert.strictEqual(members.length, 3);
assert(members.includes('1'));
assert(members.includes('2'));
assert(members.includes('3'));
});
});
describe('getSetMembers()', () => {

2
test/template-helpers.js
View File

@@ -126,7 +126,7 @@ describe('helpers', () => {
it('should show reject invite button if isInvited', (done) => {
const btn = helpers.membershipBtn({ displayName: 'some group', name: 'some group', isInvited: true });
assert.equal(btn, '<button class="btn btn-link" data-action="rejectInvite" data-group="some group">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="some group"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>');
assert.equal(btn, '<button class="btn btn-warning" data-action="rejectInvite" data-group="some group">[[groups:membership.reject]]</button><button class="btn btn-success" data-action="acceptInvite" data-group="some group"><i class="fa fa-plus"></i> [[groups:membership.accept-invitation]]</button>');
done();
});