From a22cc30293d1ea5b4746cfe3724abfc7186ec067 Mon Sep 17 00:00:00 2001
From: innerthunder <brandonerickson98@gmail.com>
Date: Tue, 5 Nov 2024 18:59:53 -0800
Subject: [PATCH] Use Fake Out over mocked Tackle in test

---
 src/test/moves/upper_hand.test.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/moves/upper_hand.test.ts b/src/test/moves/upper_hand.test.ts
index d2fa365d3fc..f94197d3fbd 100644
--- a/src/test/moves/upper_hand.test.ts
+++ b/src/test/moves/upper_hand.test.ts
@@ -1,11 +1,11 @@
-import { allMoves } from "#app/data/move";
+import { BattlerIndex } from "#app/battle";
 import { MoveResult } from "#app/field/pokemon";
 import { Abilities } from "#enums/abilities";
 import { Moves } from "#enums/moves";
 import { Species } from "#enums/species";
 import GameManager from "#test/utils/gameManager";
 import Phaser from "phaser";
-import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeAll, beforeEach, describe, expect, it } from "vitest";
 
 describe("Moves - Upper Hand", () => {
   let phaserGame: Phaser.Game;
@@ -84,14 +84,17 @@ describe("Moves - Upper Hand", () => {
   });
 
   it("should fail if the target has already moved", async () => {
-    game.override.enemyMoveset(Moves.TACKLE);
-    vi.spyOn(allMoves[Moves.TACKLE], "priority", "get").mockReturnValue(4);
+    game.override
+      .enemyMoveset(Moves.FAKE_OUT)
+      .enemyAbility(Abilities.SHEER_FORCE);
 
     await game.classicMode.startBattle([ Species.FEEBAS ]);
 
     const feebas = game.scene.getPlayerPokemon()!;
 
     game.move.select(Moves.UPPER_HAND);
+
+    await game.setTurnOrder([ BattlerIndex.ENEMY, BattlerIndex.PLAYER ]);
     await game.phaseInterceptor.to("BerryPhase");
 
     expect(feebas.getLastXMoves()[0].result).toBe(MoveResult.FAIL);