From 6e762ad80a0ba764a3a6e6d89bd7890c950063a4 Mon Sep 17 00:00:00 2001
From: Dean <me@deann.dev>
Date: Mon, 16 Jun 2025 21:06:53 -0700
Subject: [PATCH] Fix dancer and baton pass tests

---
 test/abilities/dancer.test.ts | 4 +++-
 test/moves/baton_pass.test.ts | 7 +------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/test/abilities/dancer.test.ts b/test/abilities/dancer.test.ts
index 2a4a3c36bcc..a2a3ca47288 100644
--- a/test/abilities/dancer.test.ts
+++ b/test/abilities/dancer.test.ts
@@ -35,6 +35,7 @@ describe("Abilities - Dancer", () => {
     await game.classicMode.startBattle([SpeciesId.ORICORIO, SpeciesId.FEEBAS]);
 
     const [oricorio, feebas] = game.scene.getPlayerField();
+    const [magikarp1] = game.scene.getEnemyField();
     game.move.changeMoveset(oricorio, [MoveId.SWORDS_DANCE, MoveId.VICTORY_DANCE, MoveId.SPLASH]);
     game.move.changeMoveset(feebas, [MoveId.SWORDS_DANCE, MoveId.SPLASH]);
 
@@ -44,8 +45,9 @@ describe("Abilities - Dancer", () => {
     await game.phaseInterceptor.to("MovePhase"); // feebas uses swords dance
     await game.phaseInterceptor.to("MovePhase", false); // oricorio copies swords dance
 
+    // Dancer order will be Magikarp, Oricorio, Magikarp based on set turn order
     let currentPhase = game.scene.phaseManager.getCurrentPhase() as MovePhase;
-    expect(currentPhase.pokemon).toBe(oricorio);
+    expect(currentPhase.pokemon).toBe(magikarp1);
     expect(currentPhase.move.moveId).toBe(MoveId.SWORDS_DANCE);
 
     await game.phaseInterceptor.to("MoveEndPhase"); // end oricorio's move
diff --git a/test/moves/baton_pass.test.ts b/test/moves/baton_pass.test.ts
index 1b1b0620133..486bb6adb90 100644
--- a/test/moves/baton_pass.test.ts
+++ b/test/moves/baton_pass.test.ts
@@ -76,12 +76,7 @@ describe("Moves - Baton Pass", () => {
     expect(game.scene.getEnemyPokemon()?.getStatStage(Stat.SPATK)).toEqual(2);
     // confirm that a switch actually happened. can't use species because I
     // can't find a way to override trainer parties with more than 1 pokemon species
-    expect(game.phaseInterceptor.log.slice(-4)).toEqual([
-      "MoveEffectPhase",
-      "SwitchSummonPhase",
-      "SummonPhase",
-      "PostSummonPhase",
-    ]);
+    expect(game.scene.getEnemyPokemon()?.summonData.moveHistory.length).toEqual(0);
   });
 
   it("doesn't transfer effects that aren't transferrable", async () => {