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

fix: broken tests from 71b205a889

Browse Source
This commit is contained in:
Julian Lam
2019-08-14 15:19:00 -04:00
parent 1ce33faaea
commit f736f0b382
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/groups/cover.js
View File

@@ -55,6 +55,8 @@ module.exports = function (Groups) {
}; };
Groups.removeCover = async function (data) { Groups.removeCover = async function (data) {
console.log('in removeCover', data);
await db.deleteObjectFields('group:' + data.groupName, ['cover:url', 'cover:thumb:url', 'cover:position']); await db.deleteObjectFields('group:' + data.groupName, ['cover:url', 'cover:thumb:url', 'cover:position']);
console.log('field deleted');
}; };
}; };

21
src/socket.io/groups.js
View File

@@ -155,8 +155,8 @@ SocketGroups.rejectAll = async (socket, data) => {
}; };
async function acceptRejectAll(method, socket, data) { async function acceptRejectAll(method, socket, data) {
const uids = groups.getPending(data.groupName); const uids = await groups.getPending(data.groupName);
await new Promise(uids.forEach(async (uid) => { await Promise.all(uids.map(async (uid) => {
await method(socket, { groupName: data.groupName, toUid: uid }); await method(socket, { groupName: data.groupName, toUid: uid });
})); }));
} }
@@ -249,10 +249,12 @@ SocketGroups.create = async (socket, data) => {
throw new Error('[[error:no-privileges]]'); throw new Error('[[error:no-privileges]]');
} }
data.ownerUid = socket.uid; data.ownerUid = socket.uid;
await groups.create(data); const groupData = await groups.create(data);
logGroupEvent(socket, 'group-create', { logGroupEvent(socket, 'group-create', {
groupName: data.name, groupName: data.name,
}); });
return groupData;
}; };
SocketGroups.delete = async (socket, data) => { SocketGroups.delete = async (socket, data) => {
@@ -279,7 +281,7 @@ SocketGroups.search = async (socket, data) => {
return groups.groups; return groups.groups;
} }
await groups.search(data.query, data.options); return await groups.search(data.query, data.options);
}; };
SocketGroups.loadMore = async (socket, data) => { SocketGroups.loadMore = async (socket, data) => {
@@ -290,12 +292,12 @@ SocketGroups.loadMore = async (socket, data) => {
var groupsPerPage = 9; var groupsPerPage = 9;
var start = parseInt(data.after, 10); var start = parseInt(data.after, 10);
var stop = start + groupsPerPage - 1; var stop = start + groupsPerPage - 1;
await groupsController.getGroupsFromSet(socket.uid, data.sort, start, stop); return await groupsController.getGroupsFromSet(socket.uid, data.sort, start, stop);
}; };
SocketGroups.searchMembers = async (socket, data) => { SocketGroups.searchMembers = async (socket, data) => {
data.uid = socket.uid; data.uid = socket.uid;
await groups.searchMembers(data); return await groups.searchMembers(data);
}; };
SocketGroups.loadMoreMembers = async (socket, data) => { SocketGroups.loadMoreMembers = async (socket, data) => {
@@ -303,7 +305,7 @@ SocketGroups.loadMoreMembers = async (socket, data) => {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }
data.after = parseInt(data.after, 10); data.after = parseInt(data.after, 10);
const users = user.getUsersFromSet('group:' + data.groupName + ':members', socket.uid, data.after, data.after + 9); const users = await user.getUsersFromSet('group:' + data.groupName + ':members', socket.uid, data.after, data.after + 9);
return { return {
users: users, users: users,
nextStart: data.after + 10, nextStart: data.after + 10,
@@ -318,7 +320,7 @@ SocketGroups.cover.update = async (socket, data) => {
} }
await canModifyGroup(socket.uid, data.groupName); await canModifyGroup(socket.uid, data.groupName);
await groups.updateCover(socket.uid, data); return await groups.updateCover(socket.uid, data);
}; };
SocketGroups.cover.remove = async (socket, data) => { SocketGroups.cover.remove = async (socket, data) => {
@@ -327,7 +329,8 @@ SocketGroups.cover.remove = async (socket, data) => {
} }
await canModifyGroup(socket.uid, data.groupName); await canModifyGroup(socket.uid, data.groupName);
await groups.removeCover(socket.uid, data); console.log('calling groups.removeCover');
await groups.removeCover(data);
}; };
async function canModifyGroup(uid, groupName) { async function canModifyGroup(uid, groupName) {

2
test/groups.js
View File

@@ -127,6 +127,7 @@ describe('Groups', function () {
it('should return the "Test" group when searched for', function (done) { it('should return the "Test" group when searched for', function (done) {
socketGroups.search({ uid: adminUid }, { query: 'test' }, function (err, groups) { socketGroups.search({ uid: adminUid }, { query: 'test' }, function (err, groups) {
console.log(groups);
assert.ifError(err); assert.ifError(err);
assert.equal(2, groups.length); assert.equal(2, groups.length);
assert.strictEqual('Test', groups[0].name); assert.strictEqual('Test', groups[0].name);
@@ -1377,6 +1378,7 @@ describe('Groups', function () {
socketGroups.cover.remove({ uid: adminUid }, { groupName: 'Test' }, function (err) { socketGroups.cover.remove({ uid: adminUid }, { groupName: 'Test' }, function (err) {
assert.ifError(err); assert.ifError(err);
db.getObjectFields('group:Test', ['cover:url'], function (err, groupData) { db.getObjectFields('group:Test', ['cover:url'], function (err, groupData) {
console.log('checking value', groupData);
assert.ifError(err); assert.ifError(err);
assert(!groupData['cover:url']); assert(!groupData['cover:url']);
done(); done();