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

fix test on redis

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-05-13 22:12:52 -04:00
parent 8920523e06
commit 6fdad4b002
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/socket.io/user.js
View File

@@ -15,7 +15,7 @@ var db = require('../database');
var userController = require('../controllers/user'); var userController = require('../controllers/user');
var privileges = require('../privileges'); var privileges = require('../privileges');
var SocketUser = {}; var SocketUser = module.exports;
require('./user/profile')(SocketUser); require('./user/profile')(SocketUser);
require('./user/search')(SocketUser); require('./user/search')(SocketUser);
@@ -327,7 +327,7 @@ SocketUser.setModerationNote = function (socket, data, callback) {
}, },
function (allowed, next) { function (allowed, next) {
if (allowed) { if (allowed) {
return next(null, allowed); return setImmediate(next, null, allowed);
} }
user.isModeratorOfAnyCategory(socket.uid, next); user.isModeratorOfAnyCategory(socket.uid, next);
@@ -346,5 +346,3 @@ SocketUser.setModerationNote = function (socket, data, callback) {
}, },
], callback); ], callback);
}; };
module.exports = SocketUser;

35
test/user.js
View File

@@ -975,15 +975,28 @@ describe('User', function () {
}); });
it('should set moderation note', function (done) { it('should set moderation note', function (done) {
User.create({ username: 'noteadmin' }, function (err, adminUid) { var adminUid;
assert.ifError(err); async.waterfall([
groups.join('administrators', adminUid, function (err) { function (next) {
assert.ifError(err); User.create({ username: 'noteadmin' }, next);
socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'this is a test user' }, function (err) { },
assert.ifError(err); function (_adminUid, next) {
socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'second moderation note' }, function (err) { adminUid = _adminUid;
assert.ifError(err); groups.join('administrators', adminUid, next);
User.getModerationNotes(testUid, 0, -1, function (err, notes) { },
function (next) {
socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'this is a test user' }, next);
},
function (next) {
setTimeout(next, 50);
},
function (next) {
socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'second moderation note' }, next);
},
function (next) {
User.getModerationNotes(testUid, 0, -1, next);
},
], function (err, notes) {
assert.ifError(err); assert.ifError(err);
assert.equal(notes[0].note, 'second moderation note'); assert.equal(notes[0].note, 'second moderation note');
assert.equal(notes[0].uid, adminUid); assert.equal(notes[0].uid, adminUid);
@@ -992,10 +1005,6 @@ describe('User', function () {
}); });
}); });
}); });
});
});
});
});
describe('approval queue', function () { describe('approval queue', function () {
var socketAdmin = require('../src/socket.io/admin'); var socketAdmin = require('../src/socket.io/admin');