Merge branch 'flagging-refactor' into develop

This commit is contained in:
Julian Lam
2016-12-19 13:00:31 -05:00
39 changed files with 1727 additions and 1427 deletions

View File

@@ -245,16 +245,6 @@ describe('socket.io', function () {
});
});
it('should reset flags', function (done) {
var socketAdmin = require('../src/socket.io/admin');
socketAdmin.user.resetFlags({uid: adminUid}, [regularUid], function (err) {
assert.ifError(err);
done();
});
});
describe('validation emails', function () {
var socketAdmin = require('../src/socket.io/admin');
var meta = require('../src/meta');