From 5e28cdfd0167f5df966ae51637b54ed7c782d610 Mon Sep 17 00:00:00 2001
From: Aster Fialla <asterfialla@gmail.com>
Date: Tue, 17 Feb 2026 07:11:22 -0500
Subject: [PATCH] adjusted beforeeach/beforeall so more pass

---
 src/helpers/memberHelper.js         | 12 ++++++------
 tests/helpers/membersHelper.test.js | 29 ++++++++++++++---------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/helpers/memberHelper.js b/src/helpers/memberHelper.js
index cf56ce3..693fbfc 100644
--- a/src/helpers/memberHelper.js
+++ b/src/helpers/memberHelper.js
@@ -1,4 +1,4 @@
-const { db } = require('../db.js')
+const { database } = require('../db.js')
 const { enums} = require('../enums.js');
 const {EmptyResultError, Op} = require('sequelize');
 const {EmbedBuilder} = require('@fluxerjs/core');
@@ -232,7 +232,7 @@ const memberHelper = {
         }
 
         const memberName = args[1];
-        return await db.members.destroy({ where: { name: {[Op.iLike]: memberName}, userid: authorId } }).then((result) => {
+        return await database.members.destroy({ where: { name: {[Op.iLike]: memberName}, userid: authorId } }).then((result) => {
             if (result) {
                 return `Member "${memberName}" has been deleted.`;
             }
@@ -282,7 +282,7 @@ const memberHelper = {
             });
         }
 
-        const member = await db.members.create({
+        const member = await database.members.create({
             name: memberName,
             userid: authorId,
             displayname: displayName,
@@ -313,7 +313,7 @@ const memberHelper = {
         if (columnName === "propic" && args[3]) {
             fluxerPropicWarning = this.setExpirationWarning(args[3]);
         }
-        return await db.members.update({[columnName]: value}, { where: { name: {[Op.iLike]: memberName}, userid: authorId } }).then(() => {
+        return await database.members.update({[columnName]: value}, { where: { name: {[Op.iLike]: memberName}, userid: authorId } }).then(() => {
             return `Updated ${columnName} for ${memberName} to ${value}${fluxerPropicWarning ?? ''}.`;
         }).catch(e => {
             if (e === EmptyResultError) {
@@ -394,7 +394,7 @@ const memberHelper = {
      * @throws { EmptyResultError } When the member is not found.
      */
     async getMemberByName (authorId, memberName) {
-        return await db.members.findOne({ where: { userid: authorId, name: {[Op.iLike]: memberName}}});
+        return await database.members.findOne({ where: { userid: authorId, name: {[Op.iLike]: memberName}}});
     },
 
     /**
@@ -423,7 +423,7 @@ const memberHelper = {
      * @returns {Promise<model[] | null>} The member object array.
      */
     async getMembersByAuthor (authorId) {
-        return await db.members.findAll({ where: { userid: authorId } });
+        return await database.members.findAll({ where: { userid: authorId } });
     },
 
 
diff --git a/tests/helpers/membersHelper.test.js b/tests/helpers/membersHelper.test.js
index bc3a4c1..4b46408 100644
--- a/tests/helpers/membersHelper.test.js
+++ b/tests/helpers/membersHelper.test.js
@@ -9,39 +9,38 @@ const {enums} = require("../../src/enums.js");
 const memberHelper = require("../../src/helpers/memberHelper.js");
 
 describe('parseMemberCommand', () => {
-    beforeAll(() => {
-        jest.spyOn(memberHelper, 'getMemberInfo').mockReturnValue("member info");
-        jest.spyOn(memberHelper, 'addNewMember').mockReturnValue("new member");
-        jest.spyOn(memberHelper, 'removeMember').mockReturnValue("remove member");
-        jest.spyOn(memberHelper, 'getAllMembersInfo').mockReturnValue("all member info");
-        jest.spyOn(memberHelper, 'updateName').mockReturnValue("update name");
-        jest.spyOn(memberHelper, 'updateDisplayName').mockReturnValue("update display name");
-        jest.spyOn(memberHelper, 'updateProxy').mockReturnValue("update proxy");
-        jest.spyOn(memberHelper, 'updatePropic').mockReturnValue("update propic");
-    });
+
     beforeEach(() => {
         jest.resetModules();
         jest.clearAllMocks();
+        jest.spyOn(memberHelper, 'getMemberInfo').mockResolvedValue("member info");
+        jest.spyOn(memberHelper, 'addNewMember').mockResolvedValue("new member");
+        jest.spyOn(memberHelper, 'removeMember').mockResolvedValue("remove member");
+        jest.spyOn(memberHelper, 'getAllMembersInfo').mockResolvedValue("all member info");
+        jest.spyOn(memberHelper, 'updateName').mockResolvedValue("update name");
+        jest.spyOn(memberHelper, 'updateDisplayName').mockResolvedValue("update display name");
+        jest.spyOn(memberHelper, 'updateProxy').mockResolvedValue("update proxy");
+        jest.spyOn(memberHelper, 'updatePropic').mockResolvedValue("update propic");
     });
 
 
     test.each([
         [['--help'], enums.help.MEMBER],
-        [['new'], 'add member'],
+        [['new'], 'new member'],
         [['remove'], 'remove member'],
         [['name'], enums.help.NAME],
         [['displayname'], enums.help.DISPLAY_NAME],
         [['proxy'], enums.help.PROXY],
         [['propic'], enums.help.PROPIC],
         [['list'], 'all member info'],
-        ['', enums.help.MEMBER],
-        [['jane', 'new'], enums.help.NEW],
-        [['somePerson'] ['name'], 'update name'],
+        [[''], enums.help.MEMBER],
+        [['somePerson', 'new'], enums.help.NEW],
+        [['somePerson', 'name'], 'update name'],
         [['somePerson', 'displayname'], 'update display name'],
         [['somePerson', 'proxy'], 'update proxy'],
         [['somePerson', 'propic'], 'update propic'],
         [['somePerson'], 'member info'],
-    ])('returns correct values', async(args, expectedResult) => {
+    ])('%s returns correct values', async(args, expectedResult) => {
         // Arrange
         const authorId = '1';
         const authorFull = 'somePerson#0001';