Claudia/PluralFlux-infra
1
1
Fork 0
forked from PluralFlux/PluralFlux
Code Pull Requests Actions Packages Releases Activity

adjusted beforeeach/beforeall so more pass

Browse Source
This commit is contained in:
Aster Fialla
2026-02-17 07:11:22 -05:00
parent a44e2745c5
commit 79d98c3618
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/helpers/memberHelper.js
View File

@@ -1,4 +1,4 @@
const { db } = require('../db.js') const { database } = require('../db.js')
const { enums} = require('../enums.js'); const { enums} = require('../enums.js');
const {EmptyResultError, Op} = require('sequelize'); const {EmptyResultError, Op} = require('sequelize');
const {EmbedBuilder} = require('@fluxerjs/core'); const {EmbedBuilder} = require('@fluxerjs/core');
@@ -232,7 +232,7 @@ const memberHelper = {
} }
const memberName = args[1]; 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) { if (result) {
return `Member "${memberName}" has been deleted.`; 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, name: memberName,
userid: authorId, userid: authorId,
displayname: displayName, displayname: displayName,
@@ -313,7 +313,7 @@ const memberHelper = {
if (columnName === "propic" && args[3]) { if (columnName === "propic" && args[3]) {
fluxerPropicWarning = this.setExpirationWarning(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 ?? ''}.`; return `Updated ${columnName} for ${memberName} to ${value}${fluxerPropicWarning ?? ''}.`;
}).catch(e => { }).catch(e => {
if (e === EmptyResultError) { if (e === EmptyResultError) {
@@ -394,7 +394,7 @@ const memberHelper = {
* @throws { EmptyResultError } When the member is not found. * @throws { EmptyResultError } When the member is not found.
*/ */
async getMemberByName (authorId, memberName) { 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. * @returns {Promise<model[] | null>} The member object array.
*/ */
async getMembersByAuthor (authorId) { async getMembersByAuthor (authorId) {
return await db.members.findAll({ where: { userid: authorId } }); return await database.members.findAll({ where: { userid: authorId } });
}, },

29
tests/helpers/membersHelper.test.js
View File

@@ -9,39 +9,38 @@ const {enums} = require("../../src/enums.js");
const memberHelper = require("../../src/helpers/memberHelper.js"); const memberHelper = require("../../src/helpers/memberHelper.js");
describe('parseMemberCommand', () => { 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(() => { beforeEach(() => {
jest.resetModules(); jest.resetModules();
jest.clearAllMocks(); 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([ test.each([
[['--help'], enums.help.MEMBER], [['--help'], enums.help.MEMBER],
[['new'], 'add member'], [['new'], 'new member'],
[['remove'], 'remove member'], [['remove'], 'remove member'],
[['name'], enums.help.NAME], [['name'], enums.help.NAME],
[['displayname'], enums.help.DISPLAY_NAME], [['displayname'], enums.help.DISPLAY_NAME],
[['proxy'], enums.help.PROXY], [['proxy'], enums.help.PROXY],
[['propic'], enums.help.PROPIC], [['propic'], enums.help.PROPIC],
[['list'], 'all member info'], [['list'], 'all member info'],
['', enums.help.MEMBER], [[''], enums.help.MEMBER],
[['jane', 'new'], enums.help.NEW], [['somePerson', 'new'], enums.help.NEW],
[['somePerson'] ['name'], 'update name'], [['somePerson', 'name'], 'update name'],
[['somePerson', 'displayname'], 'update display name'], [['somePerson', 'displayname'], 'update display name'],
[['somePerson', 'proxy'], 'update proxy'], [['somePerson', 'proxy'], 'update proxy'],
[['somePerson', 'propic'], 'update propic'], [['somePerson', 'propic'], 'update propic'],
[['somePerson'], 'member info'], [['somePerson'], 'member info'],
])('returns correct values', async(args, expectedResult) => { ])('%s returns correct values', async(args, expectedResult) => {
// Arrange // Arrange
const authorId = '1'; const authorId = '1';
const authorFull = 'somePerson#0001'; const authorFull = 'somePerson#0001';