From b7fd8b6ee71df38ebaf3cbd8448ec55fdf31ada3 Mon Sep 17 00:00:00 2001 From: TriForMine Date: Tue, 13 Apr 2021 13:42:36 +0200 Subject: [PATCH] fix(tests): fix typescripts errors --- .../channel_overwrite_has_permission.ts | 2 +- tests/channels/create_channel.ts | 2 +- tests/channels/delete_channel_overwrite.ts | 2 +- tests/channels/edit_channel_overwrite.ts | 4 +-- tests/emojis/create_emoji.ts | 4 +-- tests/emojis/delete_emoji.ts | 6 ++-- tests/emojis/edit_emoji.ts | 8 +++--- tests/emojis/get_emoji.ts | 8 +++--- tests/emojis/get_emojis.ts | 4 +-- tests/messages/create_message.ts | 28 +++++++++---------- tests/messages/get_messages.ts | 2 +- tests/roles/add_role.ts | 6 ++-- tests/roles/remove_role.ts | 10 +++---- tests/util/delay_until.ts | 2 +- 14 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/channels/channel_overwrite_has_permission.ts b/tests/channels/channel_overwrite_has_permission.ts index d57532c20..d7dcd49b4 100644 --- a/tests/channels/channel_overwrite_has_permission.ts +++ b/tests/channels/channel_overwrite_has_permission.ts @@ -39,7 +39,7 @@ async function ifItFailsBlameWolf(options: CreateGuildChannel, save = false) { channelOverwriteHasPermission( channel.guildId, botId, - cache.channels.get(channel.id)?.permissionOverwrites, + cache.channels.get(channel.id)!.permissionOverwrites || [], options.permissionOverwrites ? options.permissionOverwrites[0].allow : [], ), true, diff --git a/tests/channels/create_channel.ts b/tests/channels/create_channel.ts index 355ebb4c7..275fb8d6d 100644 --- a/tests/channels/create_channel.ts +++ b/tests/channels/create_channel.ts @@ -38,7 +38,7 @@ async function ifItFailsBlameWolf(options: CreateGuildChannel, save = false) { if ( options.permissionOverwrites && - channel.permissionOverwrites.length !== options.permissionOverwrites.length + channel.permissionOverwrites?.length !== options.permissionOverwrites.length ) { throw new Error( "The channel was supposed to have a permissionOverwrites but it does not appear to be the same permissionOverwrites.", diff --git a/tests/channels/delete_channel_overwrite.ts b/tests/channels/delete_channel_overwrite.ts index 5c63dad59..c25ad2263 100644 --- a/tests/channels/delete_channel_overwrite.ts +++ b/tests/channels/delete_channel_overwrite.ts @@ -25,7 +25,7 @@ async function ifItFailsBlameWolf(options: CreateGuildChannel, save = false) { if ( options.permissionOverwrites && - channel.permissionOverwrites.length !== options.permissionOverwrites.length + channel.permissionOverwrites?.length !== options.permissionOverwrites.length ) { throw new Error( "The channel was supposed to have a permissionOverwrites but it does not appear to be the same permissionOverwrites.", diff --git a/tests/channels/edit_channel_overwrite.ts b/tests/channels/edit_channel_overwrite.ts index 91af1e4d3..82ab7ffb7 100644 --- a/tests/channels/edit_channel_overwrite.ts +++ b/tests/channels/edit_channel_overwrite.ts @@ -47,7 +47,7 @@ async function ifItFailsBlameWolf(options: CreateGuildChannel, save = false) { channelOverwriteHasPermission( channel.guildId, botId, - cache.channels.get(channel.id)?.permissionOverwrites, + cache.channels.get(channel.id)?.permissionOverwrites || [], ["VIEW_CHANNEL", "ADD_REACTIONS"], ), ); @@ -56,7 +56,7 @@ async function ifItFailsBlameWolf(options: CreateGuildChannel, save = false) { channelOverwriteHasPermission( channel.guildId, botId, - cache.channels.get(channel.id)?.permissionOverwrites, + cache.channels.get(channel.id)?.permissionOverwrites || [], ["VIEW_CHANNEL", "ADD_REACTIONS"], ), true, diff --git a/tests/emojis/create_emoji.ts b/tests/emojis/create_emoji.ts index 4b4905a77..beccd6543 100644 --- a/tests/emojis/create_emoji.ts +++ b/tests/emojis/create_emoji.ts @@ -22,11 +22,11 @@ Deno.test({ await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); assertEquals( - cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), true, ); }, diff --git a/tests/emojis/delete_emoji.ts b/tests/emojis/delete_emoji.ts index 83d8bb11b..86a306c57 100644 --- a/tests/emojis/delete_emoji.ts +++ b/tests/emojis/delete_emoji.ts @@ -21,18 +21,18 @@ async function ifItFailsBlameWolf(reason?: string) { await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); await deleteEmoji(tempData.guildId, emoji.id!, reason); await delayUntil( 10000, - () => !cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => !cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); assertEquals( - cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), false, ); } diff --git a/tests/emojis/edit_emoji.ts b/tests/emojis/edit_emoji.ts index 07214388d..1703a1b5d 100644 --- a/tests/emojis/edit_emoji.ts +++ b/tests/emojis/edit_emoji.ts @@ -23,22 +23,22 @@ Deno.test({ await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); - await editEmoji(tempData.guildId, emoji.id, { + await editEmoji(tempData.guildId, emoji.id!, { name: "blamewolf_infinite", }); await delayUntil( 10000, () => - cache.guilds.get(tempData.guildId)?.emojis?.get(emoji.id)?.name === + cache.guilds.get(tempData.guildId)?.emojis?.get(emoji.id!)?.name === "blamewolf_infinite", ); assertEquals( - cache.guilds.get(tempData.guildId)?.emojis?.get(emoji.id)?.name, + cache.guilds.get(tempData.guildId)?.emojis?.get(emoji.id!)?.name, "blamewolf_infinite", ); }, diff --git a/tests/emojis/get_emoji.ts b/tests/emojis/get_emoji.ts index 4396a6f73..2bd59b130 100644 --- a/tests/emojis/get_emoji.ts +++ b/tests/emojis/get_emoji.ts @@ -23,20 +23,20 @@ Deno.test({ await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); - cache.guilds.get(tempData.guildId)?.emojis?.delete(emoji.id); + cache.guilds.get(tempData.guildId)?.emojis?.delete(emoji.id!); await getEmoji(tempData.guildId, emoji.id!); await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + () => cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), ); assertEquals( - cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id), + cache.guilds.get(tempData.guildId)?.emojis?.has(emoji.id!), true, ); }, diff --git a/tests/emojis/get_emojis.ts b/tests/emojis/get_emojis.ts index 5cad14508..75e8d8c1b 100644 --- a/tests/emojis/get_emojis.ts +++ b/tests/emojis/get_emojis.ts @@ -13,10 +13,10 @@ Deno.test({ await delayUntil( 10000, - () => cache.guilds.get(tempData.guildId)?.emojis?.size > 0, + () => (cache.guilds.get(tempData.guildId)?.emojis?.size || 0) > 0, ); - assertEquals(cache.guilds.get(tempData.guildId)?.emojis?.size > 0, true); + assertEquals((cache.guilds.get(tempData.guildId)?.emojis?.size || 0) > 0, true); }, ...defaultTestOptions, }); diff --git a/tests/messages/create_message.ts b/tests/messages/create_message.ts index 3293e4d51..c2f491063 100644 --- a/tests/messages/create_message.ts +++ b/tests/messages/create_message.ts @@ -24,7 +24,7 @@ async function ifItFailsBlameWolf( }, }; } else if (content === "reply") { - const message = await sendMessage(channel.id, "Test Message"); + const message = await sendMessage(channel?.id!, "Test Message"); assertExists(message); // Wait few seconds for the channel create event to arrive and cache it await delayUntil(10000, () => cache.messages.has(message.id)); @@ -38,7 +38,7 @@ async function ifItFailsBlameWolf( }, messageReference: { messageId: message.id, - channelId: channel.id, + channelId: channel?.id, guildId: tempData.guildId, failIfNotExists: true, }, @@ -46,26 +46,26 @@ async function ifItFailsBlameWolf( } const message = type === "raw" - ? await sendMessage(channel.id, messageContent) - : await channel.send(messageContent); + ? await sendMessage(channel?.id!, messageContent) + : await channel?.send(messageContent); // Assertions assertExists(message); // Delay the execution by 5 seconds to allow MESSAGE_CREATE event to be processed - await delayUntil(10000, () => cache.messages.has(message.id)); + await delayUntil(10000, () => cache.messages.has(message?.id!)); - if (!cache.messages.has(message.id)) { + if (!cache.messages.has(message?.id!)) { throw new Error("The message seemed to be sent but it was not cached."); } if (content === "string") { - assertEquals(cache.messages.get(message.id)?.content, messageContent); + assertEquals(cache.messages.get(message?.id!)?.content, messageContent); } else if (content === "embed") { - assertEquals(cache.messages.get(message.id)?.embeds?.length, 1); + assertEquals(cache.messages.get(message?.id!)?.embeds?.length, 1); } else { assertEquals( - cache.messages.get(message.id)?.messageReference.messageId, + cache.messages.get(message?.id!)?.messageReference?.messageId, secondMessageId, ); } @@ -125,20 +125,20 @@ Deno.test({ const channel = cache.channels.get(tempData.channelId); assertExists(channel); - const message = await sendMessage(channel.id, "Test Message"); + const message = await sendMessage(channel?.id!, "Test Message"); assertExists(message); // Wait few seconds for the channel create event to arrive and cache it - await delayUntil(10000, () => cache.messages.has(message.id)); + await delayUntil(10000, () => cache.messages.has(message?.id!)); const reply = await message.reply("Welcome!"); - await delayUntil(10000, () => cache.messages.has(reply.id)); + await delayUntil(10000, () => cache.messages.has(reply?.id!)); - if (!cache.messages.has(reply.id)) { + if (!cache.messages.has(reply?.id!)) { throw new Error("The message seemed to be sent but it was not cached."); } assertEquals( - cache.messages.get(reply.id)?.messageReference.messageId, + cache.messages.get(reply.id)?.messageReference?.messageId, message.id, ); }, diff --git a/tests/messages/get_messages.ts b/tests/messages/get_messages.ts index 21f30c325..6c0b73b07 100644 --- a/tests/messages/get_messages.ts +++ b/tests/messages/get_messages.ts @@ -43,7 +43,7 @@ Deno.test({ limit: 2, }); // Check if getMessages has worked - assertEquals(fetchedMessages.length, 2); + assertEquals(fetchedMessages?.length, 2); }, ...defaultTestOptions, }); diff --git a/tests/roles/add_role.ts b/tests/roles/add_role.ts index b489886a8..81c4f4084 100644 --- a/tests/roles/add_role.ts +++ b/tests/roles/add_role.ts @@ -26,20 +26,20 @@ async function ifItFailsBlameWolf(type: "getter" | "raw", reason?: string) { if (type === "raw") { await addRole(tempData.guildId, botId, role.id, reason); } else { - await cache.members.get(botId).addRole(tempData.guildId, role.id, reason); + await cache.members.get(botId)!.addRole(tempData.guildId, role.id, reason); } // Delay the execution by 5 seconds to allow GUILD_MEMBER_UPDATE event to be processed await delayUntil( 10000, () => - cache.members.get(botId)?.guilds.get(tempData.guildId).roles.includes( + cache.members.get(botId)?.guilds.get(tempData.guildId)!.roles.includes( role.id, ), ); assertEquals( - cache.members.get(botId)?.guilds.get(tempData.guildId).roles.includes( + cache.members.get(botId)?.guilds.get(tempData.guildId)!.roles.includes( role.id, ), true, diff --git a/tests/roles/remove_role.ts b/tests/roles/remove_role.ts index 8e0044a8d..f529d121b 100644 --- a/tests/roles/remove_role.ts +++ b/tests/roles/remove_role.ts @@ -27,14 +27,14 @@ async function ifItFailsBlameWolf(type: "getter" | "raw", reason?: string) { if (type === "raw") { await addRole(tempData.guildId, botId, role.id, reason); } else { - await cache.members.get(botId).addRole(tempData.guildId, role.id, reason); + await cache.members.get(botId)!.addRole(tempData.guildId, role.id, reason); } // Delay the execution by 5 seconds to allow GUILD_MEMBER_UPDATE event to be processed await delayUntil( 10000, () => - cache.members.get(botId)?.guilds.get(tempData.guildId).roles.includes( + cache.members.get(botId)?.guilds.get(tempData.guildId)!.roles.includes( role.id, ), ); @@ -42,7 +42,7 @@ async function ifItFailsBlameWolf(type: "getter" | "raw", reason?: string) { if (type === "raw") { await removeRole(tempData.guildId, botId, role.id, reason); } else { - await cache.members.get(botId).removeRole( + await cache.members.get(botId)!.removeRole( tempData.guildId, role.id, reason, @@ -53,13 +53,13 @@ async function ifItFailsBlameWolf(type: "getter" | "raw", reason?: string) { await delayUntil( 10000, () => - !cache.members.get(botId)?.guilds.get(tempData.guildId).roles.includes( + !cache.members.get(botId)?.guilds.get(tempData.guildId)!.roles.includes( role.id, ), ); assertEquals( - cache.members.get(botId)?.guilds.get(tempData.guildId).roles.includes( + cache.members.get(botId)?.guilds.get(tempData.guildId)!.roles.includes( role.id, ), false, diff --git a/tests/util/delay_until.ts b/tests/util/delay_until.ts index 77f7cb3ae..931fd9ef6 100644 --- a/tests/util/delay_until.ts +++ b/tests/util/delay_until.ts @@ -1,6 +1,6 @@ export async function delayUntil( maxMs: number, - isReady: () => boolean, + isReady: () => boolean | undefined, timeoutTime = 100, ): Promise { const maxTime = Date.now() + maxMs;