From 10c145a02d3df9df1c5fb489cf55c8f274fe6929 Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Mon, 23 Feb 2026 12:27:25 -0500
Subject: [PATCH] imported env files better

---
 .dockerignore     | 2 +-
 .env.jest         | 2 ++
 src/bot.js        | 7 ++++---
 tests/bot.test.js | 8 +++-----
 4 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 .env.jest

diff --git a/.dockerignore b/.dockerignore
index cd967fc..60b99a7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,5 @@
 **/.dockerignore
-**/.env
+.env.jest
 **/.git
 **/.gitignore
 **/.project
diff --git a/.env.jest b/.env.jest
new file mode 100644
index 0000000..c130787
--- /dev/null
+++ b/.env.jest
@@ -0,0 +1,2 @@
+FLUXER_BOT_TOKEN=jest-fluxer-bot-token
+POSTGRES_PASSWORD=jest-postgres-password
\ No newline at end of file
diff --git a/src/bot.js b/src/bot.js
index 33179e0..00ebfd5 100644
--- a/src/bot.js
+++ b/src/bot.js
@@ -3,12 +3,12 @@ import { messageHelper } from "./helpers/messageHelper.js";
 import {enums} from "./enums.js";
 import {commands} from "./commands.js";
 import {webhookHelper} from "./helpers/webhookHelper.js";
-import * as env from 'dotenv';
+import env from 'dotenv';
 import {utils} from "./helpers/utils.js";
 
-env.config();
+env.config({path: './.env'});
 
-const token = process.env.FLUXER_BOT_TOKEN;
+export const token = process.env.FLUXER_BOT_TOKEN;
 
 if (!token) {
     console.error("Missing FLUXER_BOT_TOKEN environment variable.");
@@ -84,6 +84,7 @@ export const debounceLogin  = utils.debounce(client.login, 60000);
 
 (async () => {
     try {
+
         await client.login(token);
         // await db.check_connection();
     } catch (err) {
diff --git a/tests/bot.test.js b/tests/bot.test.js
index 773d56e..a9e3e08 100644
--- a/tests/bot.test.js
+++ b/tests/bot.test.js
@@ -1,4 +1,4 @@
-const env = require('dotenv');
+const env = require('dotenv').config({path: './.env.jest'})
 const {enums} = require("../src/enums.js");
 
 jest.mock('@fluxerjs/core', () => {
@@ -59,12 +59,9 @@ const {commands} = require("../src/commands.js");
 const {webhookHelper} = require("../src/helpers/webhookHelper.js");
 
 const {utils} = require("../src/helpers/utils.js");
-let {handleMessageCreate, client, debounceLogin} = require("../src/bot.js");
-
-env.config();
+let {handleMessageCreate, client} = require("../src/bot.js");
 
 describe('bot', () => {
-
     beforeEach(() => {
         jest.resetModules();
         jest.clearAllMocks();
@@ -74,6 +71,7 @@ describe('bot', () => {
 
         test('on message creation, if message is from bot, return', () => {
             // Arrange
+            console.log(env)
             const message = {
                 author: {
                     bot: true