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

This commit is contained in:
Julian Lam
2017-03-10 15:44:29 -05:00
26 changed files with 250 additions and 111 deletions

View File

@@ -1181,6 +1181,14 @@ describe('Topic\'s', function () {
});
});
});
it('should not do anything if tids is empty array', function (done) {
socketTopics.markAsRead({ uid: adminUid }, [], function (err, markedRead) {
assert.ifError(err);
assert(!markedRead);
done();
});
});
});
describe('tags', function () {