Fix/improve tests

Author: gc

tests/globalSetup.ts

@@ -16,7 +16,7 @@ vi.mock('@oldschoolgg/toolkit', async () => {
 		awaitMessageComponentInteraction: vi.fn().mockImplementation(({ message }: { message: Message }) => {
 			return Promise.resolve({
 				customId: randArrItem(Object.values(InteractionID.Slayer)),
-				...mockInteraction({ userId: message.author.id })
+				...mockInteraction({ user: { id: message.author.id } as any })
 			});
 		})
 	};

tests/integration/allCommandsBase.test.ts

@@ -150,7 +150,8 @@ test(
 			['minion', 'daily'],
 			['gamble', 'luckypick'],
 			['gamble', 'duel'],
-			['config', 'toggle']
+			['config', 'toggle'],
+			['gear', 'best_in_slot']
 		];
 
 		const useCommandOptions: Record<string, any>[] = [];

tests/integration/trading.test.ts

@@ -46,7 +46,7 @@ test('Trade consistency', async () => {
 						user: other
 					}
 				},
-				interaction: mockInteraction({ userId: user.id })
+				interaction: mockInteraction({ user })
 			};
 
 			switch (method) {

tests/integration/util.ts

@@ -71,11 +71,14 @@ class MockInteraction {
 	async reply(res: any) {
 		this.__response__ = res;
 	}
+
+	mUser: MUser;
 	user = {
 		id: '123456789'
 	};
-	constructor(userId: string) {
-		this.user.id = userId;
+	constructor({ user }: { user: MUser }) {
+		this.mUser = user;
+		this.user.id = user.id;
 	}
 
 	async confirmation() {
@@ -99,8 +102,8 @@ class MockInteraction {
 	}
 }
 
-export function mockInteraction({ userId }: { userId: string }) {
-	return new MockInteraction(userId) as any;
+export function mockInteraction({ user }: { user: MUser }): MInteraction {
+	return new MockInteraction({ user }) as any as MInteraction;
 }
 
 export function mockChannel({ userId }: { userId: string }) {
@@ -283,7 +286,7 @@ export class TestUser extends MUserClass {
 
 	async runCommand(command: OSBMahojiCommand, options: object = {}, syncAfter = false) {
 		await this.sync();
-		const mockedInt = mockInteraction({ userId: this.user.id });
+		const mockedInt = mockInteraction({ user: this });
 		const result = await command.run({
 			userID: this.user.id,
 			guildID: '342983479501389826',