diff --git a/src/commands.js b/src/commands.js index dd41528..ac280cf 100644 --- a/src/commands.js +++ b/src/commands.js @@ -45,8 +45,12 @@ cmds.memberCommand = async function(message, args) { await message.reply({embeds: [reply]}) } else if (typeof reply === 'object') { - const errorsText = reply.errors.length > 0 ? reply.errors.join('\n- ') : null; - return await message.reply({content: `${reply.success} ${errorsText ? `\n\n${enums.err.ERRORS_OCCURRED}\n` + errorsText : ""}`, embeds: [reply.embed]}) + // The little dash is so that the errors print out in bullet points in Fluxer + const errorsText = reply.errors.length > 0 ? '- ' + reply.errors.join('\n- ') : null; + return await message.reply({ + content: `${reply.success} ${errorsText ? `\n\n${enums.err.ERRORS_OCCURRED}\n` + errorsText : ""}`, + embeds: [reply.embed] + }) } } diff --git a/tests/commands.test.js b/tests/commands.test.js index 9537944..a35bdb1 100644 --- a/tests/commands.test.js +++ b/tests/commands.test.js @@ -107,17 +107,19 @@ describe('commands', () => { const reply = { errors: ['error', 'error2'], success: 'success', - embed: {} + embed: {title: 'hi'} } + const expected = { + content: `success \n\n${enums.err.ERRORS_OCCURRED}\n- error\n- error2`, + embeds: [reply.embed] + } + console.log(expected) memberHelper.parseMemberCommand = jest.fn().mockResolvedValue(reply); // Act await commands.memberCommand(message, args); // Assert expect(message.reply).toHaveBeenCalledTimes(1); - expect(message.reply).toHaveBeenCalledWith({ - content: `success\n\n${enums.err.ERRORS_OCCURRED}\n\nerror\nerror2`, - embeds: [reply.embed] - }) + expect(message.reply).toHaveBeenCalledWith(expected) }) describe('importCommand', () => {