hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more tests

Browse Source
v1.18.x
Barış Soner Uşaklı 8 years ago
parent f1ef5e5582
commit 8920523e06
6 changed files with 162 additions and 143 deletions
Show Stats Download Patch File Download Diff File

2
src/flags.js
Unescape Escape View File

@ -685,5 +685,3 @@ Flags.notify = function (flagObj, uid, callback) {
break; break;
} }
}; };
module.exports = Flags;

121
src/notifications.js
Unescape Escape View File

@ -331,82 +331,83 @@ Notifications.markReadMultiple = function (nids, uid, callback) {
db.getObjectsFields(notificationKeys, ['nid', 'datetime'], next); db.getObjectsFields(notificationKeys, ['nid', 'datetime'], next);
}, },
], function (err, notificationData) { function (notificationData, next) {
if (err) { // Filter out notifications that didn't exist
return callback(err); notificationData = notificationData.filter(function (notification) {
} return notification && notification.nid;
});
// Filter out notifications that didn't exist
notificationData = notificationData.filter(function (notification) {
return notification && notification.nid;
});
// Extract nid // Extract nid
nids = notificationData.map(function (notification) { nids = notificationData.map(function (notification) {
return notification.nid; return notification.nid;
}); });
var datetimes = notificationData.map(function (notification) { var datetimes = notificationData.map(function (notification) {
return (notification && notification.datetime) || Date.now(); return (notification && notification.datetime) || Date.now();
}); });
async.parallel([ async.parallel([
function (next) { function (next) {
db.sortedSetRemove('uid:' + uid + ':notifications:unread', nids, next); db.sortedSetRemove('uid:' + uid + ':notifications:unread', nids, next);
}, },
function (next) { function (next) {
db.sortedSetAdd('uid:' + uid + ':notifications:read', datetimes, nids, next); db.sortedSetAdd('uid:' + uid + ':notifications:read', datetimes, nids, next);
}, },
], function (err) { ], next);
callback(err); },
}); ], function (err) {
callback(err);
}); });
}; };
Notifications.markAllRead = function (uid, callback) { Notifications.markAllRead = function (uid, callback) {
db.getSortedSetRevRange('uid:' + uid + ':notifications:unread', 0, 99, function (err, nids) { async.waterfall([
if (err) { function (next) {
return callback(err); db.getSortedSetRevRange('uid:' + uid + ':notifications:unread', 0, 99, next);
} },
function (nids, next) {
if (!Array.isArray(nids) || !nids.length) { if (!Array.isArray(nids) || !nids.length) {
return callback(); return next();
} }
Notifications.markReadMultiple(nids, uid, callback); Notifications.markReadMultiple(nids, uid, next);
}); },
], callback);
}; };
Notifications.prune = function () { Notifications.prune = function (callback) {
callback = callback || function () {};
var week = 604800000; var week = 604800000;
var cutoffTime = Date.now() - week; var cutoffTime = Date.now() - week;
db.getSortedSetRangeByScore('notifications', 0, 500, '-inf', cutoffTime, function (err, nids) { async.waterfall([
if (err) { function (next) {
return winston.error(err.message); db.getSortedSetRangeByScore('notifications', 0, 500, '-inf', cutoffTime, next);
} },
function (nids, next) {
if (!Array.isArray(nids) || !nids.length) { if (!Array.isArray(nids) || !nids.length) {
return; return callback();
} }
var keys = nids.map(function (nid) { var keys = nids.map(function (nid) {
return 'notifications:' + nid; return 'notifications:' + nid;
}); });
async.parallel([ async.parallel([
function (next) { function (next) {
db.sortedSetRemove('notifications', nids, next); db.sortedSetRemove('notifications', nids, next);
}, },
function (next) { function (next) {
db.deleteAll(keys, next); db.deleteAll(keys, next);
}, },
], function (err) { ], next);
if (err) { },
return winston.error('Encountered error pruning notifications: ' + err.message); ], function (err) {
} if (err) {
}); winston.error('Encountered error pruning notifications: ' + err.message);
}
callback(err);
}); });
}; };

91
src/user/info.js
Unescape Escape View File

@ -30,21 +30,15 @@ module.exports = function (User) {
}, },
function (_reason, next) { function (_reason, next) {
reason = _reason && _reason.length ? _reason[0] : ''; reason = _reason && _reason.length ? _reason[0] : '';
next(); next(null, {
uid: uid,
timestamp: timestamp,
expiry: parseInt(expiry, 10),
expiry_readable: new Date(parseInt(expiry, 10)).toString(),
reason: validator.escape(String(reason)),
});
}, },
], function (err) { ], callback);
if (err) {
return callback(err);
}
callback(null, {
uid: uid,
timestamp: timestamp,
expiry: parseInt(expiry, 10),
expiry_readable: new Date(parseInt(expiry, 10)).toString(),
reason: validator.escape(String(reason)),
});
});
}; };
User.getModerationHistory = function (uid, callback) { User.getModerationHistory = function (uid, callback) {
@ -59,48 +53,46 @@ module.exports = function (User) {
function (data, next) { function (data, next) {
getFlagMetadata(data, next); getFlagMetadata(data, next);
}, },
], function (err, data) { function (data, next) {
if (err) { formatBanData(data);
return callback(err); next(null, data);
} },
formatBanData(data); ], callback);
callback(null, data);
});
}; };
User.getHistory = function (set, callback) { User.getHistory = function (set, callback) {
db.getSortedSetRevRangeWithScores(set, 0, -1, function (err, data) { async.waterfall([
if (err) { function (next) {
return callback(err); db.getSortedSetRevRangeWithScores(set, 0, -1, next);
} },
callback(null, data.map(function (set) { function (data, next) {
set.timestamp = set.score; next(null, data.map(function (set) {
set.timestampISO = utils.toISOString(set.score); set.timestamp = set.score;
set.value = validator.escape(String(set.value.split(':')[0])); set.timestampISO = utils.toISOString(set.score);
delete set.score; set.value = validator.escape(String(set.value.split(':')[0]));
return set; delete set.score;
})); return set;
}); }));
},
], callback);
}; };
function getFlagMetadata(data, callback) { function getFlagMetadata(data, callback) {
var pids = data.flags.map(function (flagObj) { var pids = data.flags.map(function (flagObj) {
return parseInt(flagObj.value, 10); return parseInt(flagObj.value, 10);
}); });
async.waterfall([
function (next) {
posts.getPostsFields(pids, ['tid'], next);
},
function (postData, next) {
var tids = postData.map(function (post) {
return post.tid;
});
posts.getPostsFields(pids, ['tid'], function (err, postData) { topics.getTopicsFields(tids, ['title'], next);
if (err) { },
return callback(err); function (topicData, next) {
}
var tids = postData.map(function (post) {
return post.tid;
});
topics.getTopicsFields(tids, ['title'], function (err, topicData) {
if (err) {
return callback(err);
}
data.flags = data.flags.map(function (flagObj, idx) { data.flags = data.flags.map(function (flagObj, idx) {
flagObj.pid = flagObj.value; flagObj.pid = flagObj.value;
flagObj.timestamp = flagObj.score; flagObj.timestamp = flagObj.score;
@ -112,10 +104,9 @@ module.exports = function (User) {
return _.extend(flagObj, topicData[idx]); return _.extend(flagObj, topicData[idx]);
}); });
next(null, data);
callback(null, data); },
}); ], callback);
});
} }
function formatBanData(data) { function formatBanData(data) {

46
src/user/profile.js
Unescape Escape View File

@ -195,27 +195,31 @@ module.exports = function (User) {
return callback(); return callback();
} }
User.getUserFields(uid, ['username', 'userslug'], function (err, userData) { async.waterfall([
if (err) { function (next) {
return callback(err); User.getUserFields(uid, ['username', 'userslug'], next);
} },
function (userData, next) {
async.parallel([ async.parallel([
function (next) { function (next) {
updateUidMapping('username', uid, newUsername, userData.username, next); updateUidMapping('username', uid, newUsername, userData.username, next);
}, },
function (next) { function (next) {
var newUserslug = utils.slugify(newUsername); var newUserslug = utils.slugify(newUsername);
updateUidMapping('userslug', uid, newUserslug, userData.userslug, next); updateUidMapping('userslug', uid, newUserslug, userData.userslug, next);
}, },
function (next) { function (next) {
async.series([ var now = Date.now();
async.apply(db.sortedSetRemove, 'username:sorted', userData.username.toLowerCase() + ':' + uid), async.series([
async.apply(db.sortedSetAdd, 'username:sorted', 0, newUsername.toLowerCase() + ':' + uid), async.apply(db.sortedSetRemove, 'username:sorted', userData.username.toLowerCase() + ':' + uid),
async.apply(db.sortedSetAdd, 'user:' + uid + ':usernames', Date.now(), newUsername + ':' + Date.now()), async.apply(db.sortedSetAdd, 'username:sorted', 0, newUsername.toLowerCase() + ':' + uid),
], next); async.apply(db.sortedSetAdd, 'user:' + uid + ':usernames', now, newUsername + ':' + now),
}, ], next);
], callback); },
], next);
},
], function (err) {
callback(err);
}); });
} }

4
test/notifications.js
Unescape Escape View File

@ -251,6 +251,10 @@ describe('Notifications', function () {
}); });
}); });
it('should prune notifications', function (done) {
notifications.prune(done);
});
after(function (done) { after(function (done) {
db.emptydb(done); db.emptydb(done);

41
test/user.js
Unescape Escape View File

@ -95,7 +95,7 @@ describe('User', function () {
assert.ifError(err); assert.ifError(err);
assert.strictEqual(username, 'Jane Doe 9'); assert.strictEqual(username, 'Jane Doe 9');
done(); next();
}); });
}, },
], done); ], done);
@ -299,7 +299,7 @@ describe('User', function () {
}); });
it('.send() should create a new reset code and reset password', function (done) { it('.send() should create a new reset code and reset password', function (done) {
User.reset.send('reset@me.com', function (err, code) { User.reset.send('reset@me.com', function (err) {
if (err) { if (err) {
console.log(err); console.log(err);
} }
@ -751,7 +751,28 @@ describe('User', function () {
}); });
}); });
describe('.getModerationHistory', function () { describe('user info', function () {
it('should return error if there is no ban reason', function (done) {
User.getLatestBanInfo(123, function (err) {
assert.equal(err.message, 'no-ban-info');
done();
});
});
it('should get history from set', function (done) {
var now = Date.now();
db.sortedSetAdd('user:' + testUid + ':usernames', now, 'derp:' + now, function (err) {
assert.ifError(err);
User.getHistory('user:' + testUid + ':usernames', function (err, data) {
assert.ifError(err);
assert.equal(data[0].value, 'derp');
assert.equal(data[0].timestamp, now);
done();
});
});
});
it('should return the correct ban reason', function (done) { it('should return the correct ban reason', function (done) {
async.series([ async.series([
function (next) { function (next) {
@ -960,15 +981,15 @@ describe('User', function () {
assert.ifError(err); assert.ifError(err);
socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'this is a test user' }, function (err) { socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'this is a test user' }, function (err) {
assert.ifError(err); assert.ifError(err);
db.getSortedSetRevRange('uid:' + testUid + ':moderation:notes', 0, 0, function (err, notes) { socketUser.setModerationNote({ uid: adminUid }, { uid: testUid, note: 'second moderation note' }, function (err) {
assert.ifError(err); assert.ifError(err);
notes = notes.map(function (noteData) { User.getModerationNotes(testUid, 0, -1, function (err, notes) {
return JSON.parse(noteData); assert.ifError(err);
assert.equal(notes[0].note, 'second moderation note');
assert.equal(notes[0].uid, adminUid);
assert(notes[0].timestamp);
done();
}); });
assert.equal(notes[0].note, 'this is a test user');
assert.equal(notes[0].uid, adminUid);
assert(notes[0].timestamp);
done();
}); });
}); });
}); });

Write Preview
Loading…
Cancel
Save