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

fix: more tests

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-07-21 20:43:16 -04:00
parent 65395ae59d
commit a46adb3fd5
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/openapi/read.yaml
View File

@@ -2204,10 +2204,8 @@ paths:
type: boolean type: boolean
runJobs: runJobs:
type: boolean type: boolean
nullable: true
jobsDisabled: jobsDisabled:
type: boolean type: boolean
nullable: true
git: git:
type: object type: object
properties: properties:

3
src/messaging/rooms.js
View File

@@ -50,10 +50,11 @@ module.exports = function (Messaging) {
db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid), db.sortedSetAdd('chat:room:' + roomId + ':uids', now, uid),
]); ]);
await Promise.all([ await Promise.all([
Messaging.addSystemMessage('user-join', uid, roomId), // chat owner should also get the user-join system message
Messaging.addUsersToRoom(uid, toUids, roomId), Messaging.addUsersToRoom(uid, toUids, roomId),
Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now), Messaging.addRoomToUsers(roomId, [uid].concat(toUids), now),
]); ]);
// chat owner should also get the user-join system message
await Messaging.addSystemMessage('user-join', uid, roomId);
return roomId; return roomId;
}; };

2
test/mocks/databasemock.js
View File

@@ -138,7 +138,7 @@ before(async function () {
nconf.set('socket.io:origins', '*:*'); nconf.set('socket.io:origins', '*:*');
nconf.set('version', packageInfo.version); nconf.set('version', packageInfo.version);
nconf.set('runJobs', false); nconf.set('runJobs', false);
nconf.set('disableJobs', true); nconf.set('jobsDisabled', true);
await meta.dependencies.check(); await meta.dependencies.check();