From 359db97a395c6cddfea5b104ea01ef84af83c00c Mon Sep 17 00:00:00 2001 From: Skillz4Killz <23035000+Skillz4Killz@users.noreply.github.com> Date: Wed, 24 Aug 2022 05:25:00 +0000 Subject: [PATCH] fix: pass tests --- helpers/channels/getChannel.ts | 10 ++++------ helpers/guilds/getBan.ts | 2 -- helpers/guilds/getGuild.ts | 3 --- helpers/webhooks/getWebhook.ts | 2 -- rest/runMethod.ts | 3 ++- tests/channels/deleteWithReason.test.ts | 5 ++--- tests/channels/deleteWithoutReason.test.ts | 5 ++--- tests/channels/messages/message.test.ts | 20 +++++++------------- tests/guilds/events/events.test.ts | 5 ++--- tests/guilds/guild.test.ts | 16 ++++++---------- tests/guilds/members/bans.test.ts | 4 ++-- tests/rest.ts | 9 ++++++--- tests/webhook/deleteWebhook.test.ts | 6 ++---- tests/webhook/deleteWebhookWithToken.test.ts | 6 ++---- 14 files changed, 37 insertions(+), 59 deletions(-) diff --git a/helpers/channels/getChannel.ts b/helpers/channels/getChannel.ts index 905f53f0f..89ea49000 100644 --- a/helpers/channels/getChannel.ts +++ b/helpers/channels/getChannel.ts @@ -10,10 +10,8 @@ export async function getChannel(bot: Bot, channelId: bigint) { ); // IF A CHANNEL DOESN'T EXIST, DISCORD RETURNS `{}` - return result.id - ? bot.transformers.channel(bot, { - channel: result, - guildId: result.guild_id ? bot.transformers.snowflake(result.guild_id) : undefined, - }) - : undefined; + return bot.transformers.channel(bot, { + channel: result, + guildId: result.guild_id ? bot.transformers.snowflake(result.guild_id) : undefined, + }); } diff --git a/helpers/guilds/getBan.ts b/helpers/guilds/getBan.ts index 0a53886a8..b2ab5e0bf 100644 --- a/helpers/guilds/getBan.ts +++ b/helpers/guilds/getBan.ts @@ -9,8 +9,6 @@ export async function getBan(bot: Bot, guildId: bigint, memberId: bigint) { bot.constants.routes.GUILD_BAN(guildId, memberId), ); - if (!result?.user) return; - return { reason: result.reason, user: bot.transformers.user(bot, result.user), diff --git a/helpers/guilds/getGuild.ts b/helpers/guilds/getGuild.ts index 3f4ca137e..9b544057d 100644 --- a/helpers/guilds/getGuild.ts +++ b/helpers/guilds/getGuild.ts @@ -18,9 +18,6 @@ export async function getGuild( bot.constants.routes.GUILD(guildId, options.counts), ); - // Sometimes the guild is not found, so we need to check for it. - if (!result.id) return; - return bot.transformers.guild(bot, { guild: result, shardId: bot.utils.calculateShardId(bot.gateway, guildId), diff --git a/helpers/webhooks/getWebhook.ts b/helpers/webhooks/getWebhook.ts index 690bf0355..bcb15e03d 100644 --- a/helpers/webhooks/getWebhook.ts +++ b/helpers/webhooks/getWebhook.ts @@ -9,7 +9,5 @@ export async function getWebhook(bot: Bot, webhookId: bigint) { bot.constants.routes.WEBHOOK_ID(webhookId), ); - if (!result?.id) return; - return bot.transformers.webhook(bot, result); } diff --git a/rest/runMethod.ts b/rest/runMethod.ts index f1c3d18e5..ccae54913 100644 --- a/rest/runMethod.ts +++ b/rest/runMethod.ts @@ -43,7 +43,8 @@ export async function runMethod( }); if (!result.ok) { - errorStack.message = result.statusText as Error["message"]; + const err = await result.json().catch(() => {}); + errorStack.message = err.message ?? result.statusText as Error["message"]; console.error(`Error: ${errorStack.message}`); throw errorStack; } diff --git a/tests/channels/deleteWithReason.test.ts b/tests/channels/deleteWithReason.test.ts index 8f56ced12..697d9e632 100644 --- a/tests/channels/deleteWithReason.test.ts +++ b/tests/channels/deleteWithReason.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists } from "../deps.ts"; +import { assertExists, assertRejects } from "../deps.ts"; import { loadBot } from "../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../utils.ts"; @@ -17,7 +17,6 @@ Deno.test({ await bot.helpers.deleteChannel(channel.id, "with a reason"); // Check if channel still exists - const exists = await bot.helpers.getChannel(channel.id); - assertEquals(exists, undefined); + await assertRejects(() => bot.helpers.getChannel(channel.id)); }, }); diff --git a/tests/channels/deleteWithoutReason.test.ts b/tests/channels/deleteWithoutReason.test.ts index 9295dfa4b..448dc7a25 100644 --- a/tests/channels/deleteWithoutReason.test.ts +++ b/tests/channels/deleteWithoutReason.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists } from "../deps.ts"; +import { assertExists, assertRejects } from "../deps.ts"; import { loadBot } from "../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../utils.ts"; @@ -18,7 +18,6 @@ Deno.test({ await bot.helpers.deleteChannel(channel.id); // Check if channel still exists - const exists = await bot.helpers.getChannel(channel.id); - assertEquals(exists, undefined); + await assertRejects(() => bot.helpers.getChannel(channel.id)); }, }); diff --git a/tests/channels/messages/message.test.ts b/tests/channels/messages/message.test.ts index 20f5e3825..4263ec206 100644 --- a/tests/channels/messages/message.test.ts +++ b/tests/channels/messages/message.test.ts @@ -1,5 +1,5 @@ import { ButtonStyles, ChannelTypes, delay, MessageComponentTypes } from "../../../mod.ts"; -import { assertEquals, assertExists, assertNotEquals } from "../../deps.ts"; +import { assertEquals, assertExists, assertNotEquals, assertRejects } from "../../deps.ts"; import { loadBot } from "../../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../../utils.ts"; @@ -167,8 +167,7 @@ Deno.test({ assertEquals(message.content, "Hello Skillz"); await bot.helpers.deleteMessage(channel.id, message.id, "Test"); - const deletedMessage = await bot.helpers.getMessage(channel.id, message.id); - assertEquals(deletedMessage, undefined); + await assertRejects(() => bot.helpers.getMessage(channel.id, message.id)); }); // Delete the message without a reason @@ -180,8 +179,7 @@ Deno.test({ assertEquals(message.content, "Hello Skillz"); await bot.helpers.deleteMessage(channel.id, message.id); - const deletedMessage = await bot.helpers.getMessage(channel.id, message.id); - assertEquals(deletedMessage, undefined); + await assertRejects(() => bot.helpers.getMessage(channel.id, message.id)); }); // Bulk delete messages with a reason @@ -199,10 +197,8 @@ Deno.test({ assertEquals(message2.content, "Hello Skillz 2"); await bot.helpers.deleteMessages(channel.id, [message1.id, message2.id], "Test"); - const deletedMessage1 = await bot.helpers.getMessage(channel.id, message1.id); - assertEquals(deletedMessage1, undefined); - const deletedMessage2 = await bot.helpers.getMessage(channel.id, message2.id); - assertEquals(deletedMessage2, undefined); + await assertRejects(() => bot.helpers.getMessage(channel.id, message1.id)); + await assertRejects(() => bot.helpers.getMessage(channel.id, message2.id)); }); // Bulk delete messages without a reason @@ -221,10 +217,8 @@ Deno.test({ await bot.helpers.deleteMessages(channel.id, [message1.id, message2.id]); await delay(3000); - const deletedMessage1 = await bot.helpers.getMessage(channel.id, message1.id); - assertEquals(deletedMessage1, undefined); - const deletedMessage2 = await bot.helpers.getMessage(channel.id, message2.id); - assertEquals(deletedMessage2, undefined); + await assertRejects(() => bot.helpers.getMessage(channel.id, message1.id)); + await assertRejects(() => bot.helpers.getMessage(channel.id, message2.id)); }); // Get a message diff --git a/tests/guilds/events/events.test.ts b/tests/guilds/events/events.test.ts index 57969fb6a..b4a6683d1 100644 --- a/tests/guilds/events/events.test.ts +++ b/tests/guilds/events/events.test.ts @@ -1,5 +1,5 @@ import { ChannelTypes, ScheduledEventEntityType, ScheduledEventPrivacyLevel } from "../../../mod.ts"; -import { assertEquals, assertExists } from "../../deps.ts"; +import { assertEquals, assertExists, assertRejects } from "../../deps.ts"; import { loadBot } from "../../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../../utils.ts"; @@ -179,8 +179,7 @@ Deno.test({ "[scheduled event] delete the guild scheduled event.", async () => { await bot.helpers.deleteScheduledEvent(CACHED_COMMUNITY_GUILD_ID, event.id); - const fetchedEvent = await bot.helpers.getScheduledEvent(CACHED_COMMUNITY_GUILD_ID, event.id); - assertEquals(fetchedEvent, undefined); + await assertRejects(() => bot.helpers.getScheduledEvent(CACHED_COMMUNITY_GUILD_ID, event.id)); }, ); diff --git a/tests/guilds/guild.test.ts b/tests/guilds/guild.test.ts index 226d880b4..96ae10303 100644 --- a/tests/guilds/guild.test.ts +++ b/tests/guilds/guild.test.ts @@ -1,5 +1,5 @@ import { ChannelTypes } from "../../mod.ts"; -import { assertEquals, assertExists, assertNotEquals } from "../deps.ts"; +import { assertEquals, assertExists, assertNotEquals, assertRejects } from "../deps.ts"; import { loadBot } from "../mod.ts"; Deno.test({ @@ -88,8 +88,7 @@ Deno.test({ // Get vanity URL await t.step("[guild] Get vanity URL", async () => { - const vanityUrl = await bot.helpers.getVanityUrl(guild.id); - assertEquals(vanityUrl.code, undefined); + await assertRejects(() => bot.helpers.getVanityUrl(guild.id)); }); // Emoji related tests @@ -128,8 +127,7 @@ Deno.test({ await bot.helpers.deleteEmoji(guild.id, emoji.id); - const exists = await bot.helpers.getEmoji(guild.id, emoji.id); - assertEquals(exists.id, undefined); + await assertRejects(() => bot.helpers.getEmoji(guild.id, emoji.id!)); }, }); @@ -149,8 +147,7 @@ Deno.test({ await bot.helpers.deleteEmoji(guild.id, emoji.id, "with a reason"); - const exists = await bot.helpers.getEmoji(guild.id, emoji.id); - assertEquals(exists.id, undefined); + await assertRejects(() => bot.helpers.getEmoji(guild.id, emoji.id!)); }, }); @@ -265,9 +262,8 @@ Deno.test({ // Delete a guild await t.step("[guild] Delete a guild", async () => { await bot.helpers.deleteGuild(guild.id); - // - const exists = await bot.helpers.getGuild(guild.id); - assertEquals(exists, undefined); + // Make sure the guild was deleted + await assertRejects(() => bot.helpers.getGuild(guild.id)); }); } catch (error) { // If any errors arise, delete the guild diff --git a/tests/guilds/members/bans.test.ts b/tests/guilds/members/bans.test.ts index 2decad742..2f8f4f06b 100644 --- a/tests/guilds/members/bans.test.ts +++ b/tests/guilds/members/bans.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists } from "../../deps.ts"; +import { assertEquals, assertExists, assertRejects } from "../../deps.ts"; import { loadBot } from "../../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../../utils.ts"; @@ -66,7 +66,7 @@ Deno.test({ bot.helpers.unbanMember(CACHED_COMMUNITY_GUILD_ID, ianID), ]); - assertEquals(await bot.helpers.getBan(CACHED_COMMUNITY_GUILD_ID, wolfID), undefined); + await assertRejects(() => bot.helpers.getBan(CACHED_COMMUNITY_GUILD_ID, wolfID)); }, }); }, diff --git a/tests/rest.ts b/tests/rest.ts index 301846ed5..1ff22a026 100644 --- a/tests/rest.ts +++ b/tests/rest.ts @@ -1,6 +1,6 @@ // START FILE FOR REST PROCESS -import { dotenv } from "./deps.ts"; import { BASE_URL, createRestManager } from "../mod.ts"; +import { dotenv } from "./deps.ts"; dotenv({ export: true, path: `${Deno.cwd()}/.env` }); @@ -88,8 +88,11 @@ async function handleRequest(conn: Deno.Conn) { error, ); requestEvent.respondWith( - new Response(JSON.stringify(error), { - status: error.code ?? 469, + new Response(JSON.stringify({ + message: error.message, + + }), { + status: error.code ?? 469, }), ); } diff --git a/tests/webhook/deleteWebhook.test.ts b/tests/webhook/deleteWebhook.test.ts index c8ad9029f..09d792851 100644 --- a/tests/webhook/deleteWebhook.test.ts +++ b/tests/webhook/deleteWebhook.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists } from "../deps.ts"; +import { assertEquals, assertExists, assertRejects } from "../deps.ts"; import { loadBot } from "../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../utils.ts"; @@ -16,9 +16,7 @@ Deno.test({ await bot.helpers.deleteWebhook(webhook.id); // Fetch the webhook to validate it was deleted - const deletedWebhook = await bot.helpers.getWebhook(webhook.id); - - assertEquals(deletedWebhook, undefined); + await assertRejects(() => bot.helpers.getWebhook(webhook.id)); await bot.helpers.deleteChannel(channel.id); }, diff --git a/tests/webhook/deleteWebhookWithToken.test.ts b/tests/webhook/deleteWebhookWithToken.test.ts index 2554d5e60..103c68420 100644 --- a/tests/webhook/deleteWebhookWithToken.test.ts +++ b/tests/webhook/deleteWebhookWithToken.test.ts @@ -1,4 +1,4 @@ -import { assertEquals, assertExists } from "../deps.ts"; +import { assertEquals, assertExists, assertRejects } from "../deps.ts"; import { loadBot } from "../mod.ts"; import { CACHED_COMMUNITY_GUILD_ID } from "../utils.ts"; @@ -17,9 +17,7 @@ Deno.test({ await bot.helpers.deleteWebhookWithToken(webhook.id, webhook.token); // Fetch the webhook to validate it was deleted - const deletedWebhook = await bot.helpers.getWebhook(webhook.id); - - assertEquals(deletedWebhook, undefined); + await assertRejects(() => bot.helpers.getWebhook(webhook.id)); await bot.helpers.deleteChannel(channel.id); },