Claudia/PluralFlux-infra
1
1
Fork 0
forked from PluralFlux/PluralFlux
Code Pull Requests Actions Packages Releases Activity

refactoring bot and tests to not use then/catch

Browse Source
This commit is contained in:
Aster Fialla
2026-02-24 14:13:48 -05:00
parent 5ba5435d46
commit b4e4e5a951
2 changed files with 60 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/bot.js
View File

@@ -37,10 +37,7 @@ export const handleMessageCreate = async function(message) {
// If message doesn't start with the bot prefix, it could still be a message with a proxy tag. If it's not, return. // If message doesn't start with the bot prefix, it could still be a message with a proxy tag. If it's not, return.
if (!content.startsWith(messageHelper.prefix)) { if (!content.startsWith(messageHelper.prefix)) {
await webhookHelper.sendMessageAsMember(client, message).catch((e) => { return await webhookHelper.sendMessageAsMember(client, message);
throw e
});
return;
} }
const commandName = content.slice(messageHelper.prefix.length).split(" ")[0]; const commandName = content.slice(messageHelper.prefix.length).split(" ")[0];
@@ -57,9 +54,7 @@ export const handleMessageCreate = async function(message) {
} }
if (command) { if (command) {
await command.execute(message, args).catch(e => { await command.execute(message, args);
throw e
});
} }
else { else {
await message.reply(enums.err.COMMAND_NOT_RECOGNIZED); await message.reply(enums.err.COMMAND_NOT_RECOGNIZED);
@@ -67,7 +62,6 @@ export const handleMessageCreate = async function(message) {
} }
catch(error) { catch(error) {
console.error(error); console.error(error);
// return await message.reply(error.message);
} }
} }
@@ -90,7 +84,6 @@ export const debounceLogin = utils.debounce(client.login, 60000);
(async () => { (async () => {
try { try {
await client.login(token); await client.login(token);
// await db.check_connection(); // await db.check_connection();
} catch (err) { } catch (err) {

69
tests/bot.test.js
View File

@@ -74,7 +74,7 @@ describe('bot', () => {
describe('handleMessageCreate', () => { describe('handleMessageCreate', () => {
test('on message creation, if message is from bot, return', () => { test('on message creation, if message is from bot, return', async() => {
// Arrange // Arrange
const message = { const message = {
author: { author: {
@@ -82,12 +82,11 @@ describe('bot', () => {
} }
} }
// Act // Act
return handleMessageCreate(message).then((res) => { const res = await handleMessageCreate(message);
expect(res).toBe(undefined); expect(res).toBeUndefined();
});
}) })
test('on message creation, if message is empty, return', () => { test('on message creation, if message is empty, return', async() => {
// Arrange // Arrange
const message = { const message = {
content: " ", content: " ",
@@ -96,13 +95,11 @@ describe('bot', () => {
} }
} }
// Act // Act
return handleMessageCreate(message).then((res) => { const res = await handleMessageCreate(message);
// Assert expect(res).toBeUndefined();
expect(res).toBe(undefined);
});
}) })
test("if message doesn't start with bot prefix, call sendMessageAsMember", () => { test("if message doesn't start with bot prefix, call sendMessageAsMember", async () => {
// Arrange // Arrange
webhookHelper.sendMessageAsMember.mockResolvedValue(); webhookHelper.sendMessageAsMember.mockResolvedValue();
const message = { const message = {
@@ -112,14 +109,13 @@ describe('bot', () => {
} }
} }
// Act // Act
return handleMessageCreate(message).then(() => { const res = await handleMessageCreate(message);
// Assert // Assert
expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledTimes(1); expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledTimes(1);
expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledWith(client, message) expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledWith(client, message)
});
}) })
test("if sendMessageAsMember returns error, log error", () => { test("if sendMessageAsMember returns error, catch and log error", async () => {
// Arrange // Arrange
webhookHelper.sendMessageAsMember.mockImplementation(() => { webhookHelper.sendMessageAsMember.mockImplementation(() => {
throw Error("error") throw Error("error")
@@ -130,20 +126,17 @@ describe('bot', () => {
bot: false bot: false
} }
} }
jest.mock('console', () => { jest.spyOn(global.console, 'error').mockImplementation(() => {})
return {error: jest.fn()}
})
// Act // Act
return handleMessageCreate(message).catch(() => { await handleMessageCreate(message);
// Assert // Assert
expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledTimes(1); expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledTimes(1);
expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledWith(client, message) expect(webhookHelper.sendMessageAsMember).toHaveBeenCalledWith(client, message)
expect(console.error).toHaveBeenCalledTimes(1); expect(console.error).toHaveBeenCalledTimes(1);
expect(console.error).toHaveBeenCalledWith(new Error('error')) expect(console.error).toHaveBeenCalledWith(new Error('error'));
});
}) })
test("if no command after prefix, return correct enum", () => { test("if no command after prefix, return correct enum", async() => {
// Arrange // Arrange
const message = { const message = {
content: "pf;", content: "pf;",
@@ -153,15 +146,14 @@ describe('bot', () => {
reply: jest.fn() reply: jest.fn()
} }
// Act // Act
return handleMessageCreate(message).then(() => { await handleMessageCreate(message);
// Assert // Assert
expect(message.reply).toHaveBeenCalledTimes(1); expect(message.reply).toHaveBeenCalledTimes(1);
expect(message.reply).toHaveBeenCalledWith(enums.help.SHORT_DESC_PLURALFLUX); expect(message.reply).toHaveBeenCalledWith(enums.help.SHORT_DESC_PLURALFLUX);
expect(webhookHelper.sendMessageAsMember).not.toHaveBeenCalled(); expect(webhookHelper.sendMessageAsMember).not.toHaveBeenCalled();
});
}) })
test("if command after prefix, call parseCommandArgs and commandsMap.get", () => { test("if command after prefix, call parseCommandArgs and commandsMap.get", async() => {
// Arrange // Arrange
const message = { const message = {
content: "pf;help", content: "pf;help",
@@ -175,17 +167,16 @@ describe('bot', () => {
} }
commands.commandsMap.get = jest.fn().mockReturnValue(command); commands.commandsMap.get = jest.fn().mockReturnValue(command);
// Act // Act
return handleMessageCreate(message).then(() => { await handleMessageCreate(message);
// Assert // Assert
expect(messageHelper.parseCommandArgs).toHaveBeenCalledTimes(1); expect(messageHelper.parseCommandArgs).toHaveBeenCalledTimes(1);
expect(messageHelper.parseCommandArgs).toHaveBeenCalledWith('pf;help', 'help'); expect(messageHelper.parseCommandArgs).toHaveBeenCalledWith('pf;help', 'help');
expect(commands.commandsMap.get).toHaveBeenCalledTimes(1); expect(commands.commandsMap.get).toHaveBeenCalledTimes(1);
expect(commands.commandsMap.get).toHaveBeenCalledWith('help'); expect(commands.commandsMap.get).toHaveBeenCalledWith('help');
expect(webhookHelper.sendMessageAsMember).not.toHaveBeenCalled(); expect(webhookHelper.sendMessageAsMember).not.toHaveBeenCalled();
});
}) })
test('if commands.commandsMap.get returns undefined, call aliasesMap.get and commandsMap.get again with that value', () => { test('if commands.commandsMap.get returns undefined, call aliasesMap.get and commandsMap.get again with that value', async() => {
// Arrange // Arrange
const message = { const message = {
content: "pf;m", content: "pf;m",
@@ -200,18 +191,17 @@ describe('bot', () => {
commands.commandsMap.get = jest.fn().mockReturnValueOnce(); commands.commandsMap.get = jest.fn().mockReturnValueOnce();
commands.aliasesMap.get = jest.fn().mockReturnValueOnce(mockAlias); commands.aliasesMap.get = jest.fn().mockReturnValueOnce(mockAlias);
// Act // Act
return handleMessageCreate(message).then(() => { await handleMessageCreate(message);
// Assert // Assert
expect(commands.commandsMap.get).toHaveBeenCalledTimes(2); expect(commands.commandsMap.get).toHaveBeenCalledTimes(2);
expect(commands.commandsMap.get).toHaveBeenNthCalledWith(1, 'm'); expect(commands.commandsMap.get).toHaveBeenNthCalledWith(1, 'm');
expect(commands.commandsMap.get).toHaveBeenNthCalledWith(2, 'member'); expect(commands.commandsMap.get).toHaveBeenNthCalledWith(2, 'member');
expect(commands.aliasesMap.get).toHaveBeenCalledTimes(1); expect(commands.aliasesMap.get).toHaveBeenCalledTimes(1);
expect(commands.aliasesMap.get).toHaveBeenCalledWith('m'); expect(commands.aliasesMap.get).toHaveBeenCalledWith('m');
});
}) })
test('if aliasesMap.get returns undefined, do not call commandsMap again', () => { test('if aliasesMap.get returns undefined, do not call commandsMap again', async() => {
// Arrange // Arrange
const message = { const message = {
content: "pf;m", content: "pf;m",
@@ -226,13 +216,10 @@ describe('bot', () => {
commands.commandsMap.get = jest.fn().mockReturnValueOnce(); commands.commandsMap.get = jest.fn().mockReturnValueOnce();
commands.aliasesMap.get = jest.fn().mockReturnValueOnce(); commands.aliasesMap.get = jest.fn().mockReturnValueOnce();
// Act // Act
return handleMessageCreate(message).then(() => { await handleMessageCreate(message);
// Assert // Assert
expect(commands.commandsMap.get).toHaveBeenCalledTimes(1);
expect(commands.commandsMap.get).toHaveBeenNthCalledWith(1, 'm');
expect(commands.aliasesMap.get).toHaveBeenCalledTimes(1); expect(commands.aliasesMap.get).toHaveBeenCalledTimes(1);
expect(commands.aliasesMap.get).toHaveBeenCalledWith('m'); expect(commands.aliasesMap.get).toHaveBeenCalledWith('m');
});
}) })
test("if command exists, call command.execute", () => { test("if command exists, call command.execute", () => {
@@ -260,12 +247,12 @@ describe('bot', () => {
}); });
}) })
test("if command.execute returns error, log error", () => { test("if command.execute returns error, log error", async () => {
// Arrange // Arrange
const command = { const command = {
execute: jest.fn() execute: jest.fn()
} }
commands.get = jest.fn().mockReturnValue(command); commands.commandsMap.get = jest.fn().mockReturnValue(command);
command.execute.mockImplementation(() => { command.execute.mockImplementation(() => {
throw Error("error") throw Error("error")
}); });
@@ -276,18 +263,15 @@ describe('bot', () => {
}, },
reply: jest.fn() reply: jest.fn()
} }
jest.mock('console', () => { jest.spyOn(global.console, 'error').mockImplementation(() => {})
return {error: jest.fn()}
})
// Act // Act
return handleMessageCreate(message).catch(() => { await handleMessageCreate(message);
// Assert // Assert
expect(console.error).toHaveBeenCalledTimes(1); expect(console.error).toHaveBeenCalledTimes(1);
expect(console.error).toHaveBeenCalledWith(new Error('error')) expect(console.error).toHaveBeenCalledWith(new Error('error'))
});
}) })
test("if command does not exist, return correct enum", () => { test("if command does not exist, return correct enum", async() => {
// Arrange // Arrange
commands.commandsMap.get = jest.fn().mockReturnValue(); commands.commandsMap.get = jest.fn().mockReturnValue();
commands.aliasesMap.get = jest.fn().mockReturnValue(); commands.aliasesMap.get = jest.fn().mockReturnValue();
@@ -299,11 +283,10 @@ describe('bot', () => {
reply: jest.fn() reply: jest.fn()
} }
// Act // Act
return handleMessageCreate(message).then(() => { await handleMessageCreate(message);
// Assert // Assert
expect(message.reply).toHaveBeenCalledWith(enums.err.COMMAND_NOT_RECOGNIZED); expect(message.reply).toHaveBeenCalledWith(enums.err.COMMAND_NOT_RECOGNIZED);
expect(message.reply).toHaveBeenCalledTimes(1); expect(message.reply).toHaveBeenCalledTimes(1);
});
}) })
}) })