From 69d329a4601c6c742e0b91a90a988e4fb0a60da9 Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Tue, 17 Jun 2025 19:04:45 -0400
Subject: [PATCH] Fixed tests

---
 test/moves/assist.test.ts  | 10 +++++-----
 test/moves/copycat.test.ts |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/moves/assist.test.ts b/test/moves/assist.test.ts
index 294ba0434e9..17f3da3d2f8 100644
--- a/test/moves/assist.test.ts
+++ b/test/moves/assist.test.ts
@@ -45,7 +45,7 @@ describe("Moves - Assist", () => {
     game.move.changeMoveset(feebas, [MoveId.CIRCLE_THROW, MoveId.ASSIST, MoveId.WOOD_HAMMER, MoveId.ACID_SPRAY]);
     game.move.changeMoveset(shuckle, [MoveId.COPYCAT, MoveId.ASSIST, MoveId.TORCH_SONG, MoveId.TACKLE]);
 
-    // Force rolling the first eligible move for both mons (ensuring the user's own moves don't count)
+    // Force rolling the first eligible move for both mons
     vi.spyOn(feebas, "randBattleSeedInt").mockImplementation(() => 0);
     vi.spyOn(shuckle, "randBattleSeedInt").mockImplementation(() => 0);
 
@@ -58,8 +58,8 @@ describe("Moves - Assist", () => {
     expect(feebas.getStatStage(Stat.SPATK)).toBe(1); // Stat raised from Assist --> Torch Song
     expect(shuckle.hp).toBeLessThan(shuckle.getMaxHp()); // recoil dmg taken from Assist --> Wood Hammer
 
-    expect(feebas.getLastXMoves().map(tm => tm.result)).toEqual([MoveResult.SUCCESS, MoveResult.SUCCESS]);
-    expect(shuckle.getLastXMoves().map(tm => tm.result)).toEqual([MoveResult.SUCCESS, MoveResult.SUCCESS]);
+    expect(feebas.getLastXMoves(-1).map(tm => tm.result)).toEqual([MoveResult.SUCCESS, MoveResult.SUCCESS]);
+    expect(shuckle.getLastXMoves(-1).map(tm => tm.result)).toEqual([MoveResult.SUCCESS, MoveResult.SUCCESS]);
   });
 
   it("should consider off-field allies", async () => {
@@ -71,7 +71,7 @@ describe("Moves - Assist", () => {
     game.move.use(MoveId.ASSIST);
     await game.toEndOfTurn();
 
-    expect(feebas.getLastXMoves(-1)).toHaveLength(1);
+    expect(feebas.getLastXMoves(-1)).toHaveLength(2);
     expect(feebas.getLastXMoves()[0]).toMatchObject({
       move: MoveId.HYPER_BEAM,
       target: [BattlerIndex.ENEMY],
@@ -98,7 +98,7 @@ describe("Moves - Assist", () => {
 
     const [feebas, shuckle] = game.scene.getPlayerParty();
     // All of these are ineligible moves
-    game.move.changeMoveset(shuckle, [MoveId.METRONOME, MoveId.DIG, MoveId.FLY, MoveId.INSTRUCT]);
+    game.move.changeMoveset(shuckle, [MoveId.METRONOME, MoveId.DIG, MoveId.FLY]);
 
     game.move.use(MoveId.ASSIST);
     await game.toEndOfTurn();
diff --git a/test/moves/copycat.test.ts b/test/moves/copycat.test.ts
index 41e1f2812bc..35b02c9122f 100644
--- a/test/moves/copycat.test.ts
+++ b/test/moves/copycat.test.ts
@@ -3,7 +3,6 @@ import { RandomMoveAttr } from "#app/data/moves/move";
 import { Stat } from "#app/enums/stat";
 import { MoveResult } from "#enums/move-result";
 import { AbilityId } from "#enums/ability-id";
-import { MoveUseMode } from "#enums/move-use-mode";
 import { MoveId } from "#enums/move-id";
 import { SpeciesId } from "#enums/species-id";
 import GameManager from "#test/testUtils/gameManager";
@@ -40,10 +39,13 @@ describe("Moves - Copycat", () => {
     await game.classicMode.startBattle([SpeciesId.FEEBAS]);
 
     game.move.select(MoveId.SWORDS_DANCE);
+    await game.move.forceEnemyMove(MoveId.SPLASH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     game.move.select(MoveId.COPYCAT); // Last successful move should be Swords Dance
     await game.move.forceEnemyMove(MoveId.SUCKER_PUNCH);
+    await game.setTurnOrder([BattlerIndex.ENEMY, BattlerIndex.PLAYER]);
     await game.toNextTurn();
 
     const player = game.field.getPlayerPokemon();