fix: more tests

v1.18.x
Barış Soner Uşaklı 5 years ago
parent 65395ae59d
commit a46adb3fd5

@ -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:

@ -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;
}; };

@ -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();

Loading…
Cancel
Save