diff --git a/test/moves/destiny-bond.test.ts b/test/moves/destiny-bond.test.ts index bbe0ae2bc37..ba51a0a53c2 100644 --- a/test/moves/destiny-bond.test.ts +++ b/test/moves/destiny-bond.test.ts @@ -76,7 +76,8 @@ describe("Moves - Destiny Bond", () => { // Turn 2: Player KO's the enemy before the enemy's turn game.move.select(moveToUse); - await game.phaseInterceptor.to("BerryPhase"); + await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); + await game.toEndOfTurn(); expect(enemyPokemon.isFainted()).toBe(true); expect(playerPokemon.isFainted()).toBe(true); diff --git a/test/moves/metronome.test.ts b/test/moves/metronome.test.ts index 63400ad8303..df51394ad00 100644 --- a/test/moves/metronome.test.ts +++ b/test/moves/metronome.test.ts @@ -95,16 +95,16 @@ describe("Moves - Metronome", () => { game.move.select(MoveId.METRONOME); await game.setTurnOrder([BattlerIndex.PLAYER, BattlerIndex.ENEMY]); - await game.phaseInterceptor.to("TurnEndPhase"); + await game.toNextTurn(); - expect(player.getTag(BattlerTagType.CHARGING)).toBeTruthy(); + expect(player).toHaveBattlerTag(BattlerTagType.CHARGING); const turn1PpUsed = metronomeMove.ppUsed; expect.soft(turn1PpUsed).toBeGreaterThan(1); expect(solarBeamMove.ppUsed).toBe(0); await game.toNextTurn(); - expect(player.getTag(BattlerTagType.CHARGING)).toBeFalsy(); + expect(player).not.toHaveBattlerTag(BattlerTagType.CHARGING); const turn2PpUsed = metronomeMove.ppUsed - turn1PpUsed; expect(turn2PpUsed).toBeGreaterThan(1); expect(solarBeamMove.ppUsed).toBe(0);