From f736f0b382c536a3e42f1ca0681dab0c2a7b34af Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 14 Aug 2019 15:19:00 -0400
Subject: [PATCH] fix: broken tests from
 71b205a889da1ee8dd326b0891d122a522084f54

---
 src/groups/cover.js     |  2 ++
 src/socket.io/groups.js | 21 ++++++++++++---------
 test/groups.js          |  2 ++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/groups/cover.js b/src/groups/cover.js
index c4b4024486..ccfa5bb303 100644
--- a/src/groups/cover.js
+++ b/src/groups/cover.js
@@ -55,6 +55,8 @@ module.exports = function (Groups) {
 	};
 
 	Groups.removeCover = async function (data) {
+		console.log('in removeCover', data);
 		await db.deleteObjectFields('group:' + data.groupName, ['cover:url', 'cover:thumb:url', 'cover:position']);
+		console.log('field deleted');
 	};
 };
diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js
index d47e065225..e10498012f 100644
--- a/src/socket.io/groups.js
+++ b/src/socket.io/groups.js
@@ -155,8 +155,8 @@ SocketGroups.rejectAll = async (socket, data) => {
 };
 
 async function acceptRejectAll(method, socket, data) {
-	const uids = groups.getPending(data.groupName);
-	await new Promise(uids.forEach(async (uid) => {
+	const uids = await groups.getPending(data.groupName);
+	await Promise.all(uids.map(async (uid) => {
 		await method(socket, { groupName: data.groupName, toUid: uid });
 	}));
 }
@@ -249,10 +249,12 @@ SocketGroups.create = async (socket, data) => {
 		throw new Error('[[error:no-privileges]]');
 	}
 	data.ownerUid = socket.uid;
-	await groups.create(data);
+	const groupData = await groups.create(data);
 	logGroupEvent(socket, 'group-create', {
 		groupName: data.name,
 	});
+
+	return groupData;
 };
 
 SocketGroups.delete = async (socket, data) => {
@@ -279,7 +281,7 @@ SocketGroups.search = async (socket, data) => {
 		return groups.groups;
 	}
 
-	await groups.search(data.query, data.options);
+	return await groups.search(data.query, data.options);
 };
 
 SocketGroups.loadMore = async (socket, data) => {
@@ -290,12 +292,12 @@ SocketGroups.loadMore = async (socket, data) => {
 	var groupsPerPage = 9;
 	var start = parseInt(data.after, 10);
 	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) => {
 	data.uid = socket.uid;
-	await groups.searchMembers(data);
+	return await groups.searchMembers(data);
 };
 
 SocketGroups.loadMoreMembers = async (socket, data) => {
@@ -303,7 +305,7 @@ SocketGroups.loadMoreMembers = async (socket, data) => {
 		throw new Error('[[error:invalid-data]]');
 	}
 	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 {
 		users: users,
 		nextStart: data.after + 10,
@@ -318,7 +320,7 @@ SocketGroups.cover.update = async (socket, data) => {
 	}
 
 	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) => {
@@ -327,7 +329,8 @@ SocketGroups.cover.remove = async (socket, data) => {
 	}
 
 	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) {
diff --git a/test/groups.js b/test/groups.js
index e8c4e3f4a9..b22ec6675c 100644
--- a/test/groups.js
+++ b/test/groups.js
@@ -127,6 +127,7 @@ describe('Groups', function () {
 
 		it('should return the "Test" group when searched for', function (done) {
 			socketGroups.search({ uid: adminUid }, { query: 'test' }, function (err, groups) {
+				console.log(groups);
 				assert.ifError(err);
 				assert.equal(2, groups.length);
 				assert.strictEqual('Test', groups[0].name);
@@ -1377,6 +1378,7 @@ describe('Groups', function () {
 			socketGroups.cover.remove({ uid: adminUid }, { groupName: 'Test' }, function (err) {
 				assert.ifError(err);
 				db.getObjectFields('group:Test', ['cover:url'], function (err, groupData) {
+					console.log('checking value', groupData);
 					assert.ifError(err);
 					assert(!groupData['cover:url']);
 					done();