diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 03c0aee22..c0ab08305 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -16,8 +16,6 @@ jobs: deno-version: ${{ matrix.deno }} - name: Cache dependencies run: deno cache mod.ts - - name: Prepare configs file - run: cp configs.example.ts configs.ts - name: Run tests if requested by maintainers if: ${{ github.event.issue.pull_request && github.event.comment.body == 'run-tests' && (github.actor == 'Skillz4Killz' || github.actor == 'itohatweb') }} run: DISCORD_TOKEN=${{ env.DISCORD_TOKEN }} deno test --unstable --coverage=coverage -A tests/mod.ts diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4af0cd765..90bcc71e4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,8 +21,6 @@ jobs: deno-version: ${{ matrix.deno }} - name: Cache dependencies run: deno cache mod.ts - - name: Prepare configs file - run: cp configs.example.ts configs.ts - name: Run test script for maintainers if: ${{ github.actor == 'Skillz4Killz' || github.actor == 'itohatweb' }} run: deno test --unstable --coverage=coverage -A tests/mod.ts diff --git a/.gitignore b/.gitignore index c7dbe8696..6f9690650 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Allows quick testing of changes and keeps stuff like tokens private debug.ts configs.ts +.env # npm stuff .npmignore diff --git a/configs.example.ts b/configs.example.ts deleted file mode 100644 index 5b4005012..000000000 --- a/configs.example.ts +++ /dev/null @@ -1 +0,0 @@ -export const UNITTEST_TOKEN = "" || Deno.env.get("DISCORD_TOKEN")!; diff --git a/tests/deps.ts b/tests/deps.ts index 97c2b3108..10d3a7f2e 100644 --- a/tests/deps.ts +++ b/tests/deps.ts @@ -9,3 +9,4 @@ export { } from "https://deno.land/std@0.115.1/testing/asserts.ts"; export * from "https://deno.land/x/discordeno_cache_plugin@0.0.21/mod.ts"; export * from "https://deno.land/x/discordeno_permissions_plugin@0.0.15/mod.ts"; +export { config as dotenv } from "https://deno.land/x/dotenv@v3.2.0/mod.ts"; diff --git a/tests/mod.ts b/tests/mod.ts index 00bbf6b61..5a36e1a02 100644 --- a/tests/mod.ts +++ b/tests/mod.ts @@ -1,6 +1,5 @@ -import { UNITTEST_TOKEN } from "../configs.ts"; import { ChannelTypes, createBot, createEventHandlers, startBot } from "../mod.ts"; -import { assertEquals, assertExists, enableCachePlugin } from "./deps.ts"; +import { assertEquals, assertExists, dotenv, enableCachePlugin } from "./deps.ts"; import { deleteMessageWithoutReasonTest, deleteMessageWithReasonTest } from "./helpers/messages/deleteMessage.ts"; import { getMessagesTest } from "./helpers/messages/getMessages.ts"; import { deleteMessagesWithoutReasonTest, deleteMessagesWithReasonTest } from "./helpers/messages/deleteMessages.ts"; @@ -30,13 +29,16 @@ import { deleteChannelOverwriteTests } from "./helpers/channels/deleteChannelOve import { editChannelTests } from "./helpers/channels/editChannel.ts"; import { CACHED_COMMUNITY_GUILD_ID, sanitizeMode } from "./constants.ts"; -if (!UNITTEST_TOKEN) throw new Error("Token was not provided."); +dotenv({ export: true }); -const botId = BigInt(atob(UNITTEST_TOKEN.split(".")[0])); +let TOKEN = Deno.env.get("DISCORD_TOKEN"); +if (!TOKEN) throw new Error("Token was not provided."); + +const botId = BigInt(atob(TOKEN.split(".")[0])); let startedAt = 0; const baseBot = createBot({ - token: UNITTEST_TOKEN, + token: TOKEN, botId, events: createEventHandlers({ ready: () => {