From da70d864b006a9074fc84275af0946436a66928b Mon Sep 17 00:00:00 2001 From: Wlowscha <54003515+Wlowscha@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:58:53 +0100 Subject: [PATCH] Fixed tests for lure abilities to account for double lures --- src/test/abilities/arena_trap.test.ts | 14 ++++++++++++-- src/test/abilities/commander.test.ts | 14 ++++++++++++-- src/test/abilities/illuminate.test.ts | 14 ++++++++++++-- src/test/abilities/no_guard.test.ts | 14 ++++++++++++-- 4 files changed, 48 insertions(+), 8 deletions(-) diff --git a/src/test/abilities/arena_trap.test.ts b/src/test/abilities/arena_trap.test.ts index 745576fc274..73f381c5e67 100644 --- a/src/test/abilities/arena_trap.test.ts +++ b/src/test/abilities/arena_trap.test.ts @@ -57,15 +57,25 @@ describe("Abilities - Arena Trap", () => { vi.spyOn(game.scene, "getDoubleBattleChance"); await game.classicMode.startBattle(); + let expected: number = 8; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 2; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(8); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); + expected = 2; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 1; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(2); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); }); /** diff --git a/src/test/abilities/commander.test.ts b/src/test/abilities/commander.test.ts index 6f2e8db48a5..736bc4a9417 100644 --- a/src/test/abilities/commander.test.ts +++ b/src/test/abilities/commander.test.ts @@ -254,14 +254,24 @@ describe("Abilities - Commander", () => { vi.spyOn(game.scene, "getDoubleBattleChance"); await game.classicMode.startBattle(); + let expected: number = 8; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 2; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(8); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); + expected = 2; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 1; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(2); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); }); }); diff --git a/src/test/abilities/illuminate.test.ts b/src/test/abilities/illuminate.test.ts index cd55d7ee945..bf9a5b5d076 100644 --- a/src/test/abilities/illuminate.test.ts +++ b/src/test/abilities/illuminate.test.ts @@ -57,14 +57,24 @@ describe("Abilities - Illuminate", () => { vi.spyOn(game.scene, "getDoubleBattleChance"); await game.classicMode.startBattle(); + let expected: number = 8; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 2; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(8); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); + expected = 2; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 1; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(2); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); }); }); diff --git a/src/test/abilities/no_guard.test.ts b/src/test/abilities/no_guard.test.ts index 1afcba86276..9fbe776e34f 100644 --- a/src/test/abilities/no_guard.test.ts +++ b/src/test/abilities/no_guard.test.ts @@ -66,15 +66,25 @@ describe("Abilities - No Guard", () => { vi.spyOn(game.scene, "getDoubleBattleChance"); await game.classicMode.startBattle(); + let expected: number = 8; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 2; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(8); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); + expected = 2; game.move.select(Moves.SPLASH); + if (game.scene.currentBattle.double) { + game.move.select(Moves.SPLASH); + expected = 1; + } await game.doKillOpponents(); await game.toNextWave(); - expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(2); + expect(game.scene.getDoubleBattleChance).toHaveLastReturnedWith(expected); }); });