make all tests work after group changes

2016-02-09 09:37:12 -08:00
parent 199eb2b3e1
commit e752949752
8 changed files with 48 additions and 31 deletions
--- a/src/userdb.js
+++ b/src/userdb.js
@@ -7,7 +7,7 @@ exports = module.exports = {
    getByAccessToken: getByAccessToken,
    getByResetToken: getByResetToken,
    getOwner: getOwner,
-    getAll: getAll,
+    getAllWithGroupIds: getAllWithGroupIds,
    getAllAdmins: getAllAdmins,
    add: add,
    del: del,
@@ -84,7 +84,7 @@ function getByResetToken(resetToken, callback) {
    });
 }

-function getAll(callback) {
+function getAllWithGroupIds(callback) {
    assert.strictEqual(typeof callback, 'function');

    database.query('SELECT ' + USERS_FIELDS + ',GROUP_CONCAT(groupMembers.groupId) AS groupIds ' +