From a580b0748775c5639a204dc09306bf4a07579521 Mon Sep 17 00:00:00 2001 From: Bertie690 Date: Thu, 29 May 2025 10:45:06 -0400 Subject: [PATCH] Fixed tests 0.5 --- test/achievements/achievement.test.ts | 1 - .../absolute-avarice-encounter.test.ts | 1 - .../mystery-encounter-utils.test.ts | 21 ++++++++++++++----- test/testUtils/helpers/moveHelper.ts | 4 +++- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/test/achievements/achievement.test.ts b/test/achievements/achievement.test.ts index ff66c8ba76b..5a74c77fe6a 100644 --- a/test/achievements/achievement.test.ts +++ b/test/achievements/achievement.test.ts @@ -130,7 +130,6 @@ describe("RibbonAchv", () => { beforeEach(() => { game = new GameManager(phaserGame); - game.override.moveset([]).startingLevel(0).starterSpecies(0).enemyMoveset([]).enemySpecies(0).startingWave(0); scene = game.scene; }); diff --git a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts index e09d7d74475..02d651583c0 100644 --- a/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts +++ b/test/mystery-encounter/encounters/absolute-avarice-encounter.test.ts @@ -138,7 +138,6 @@ describe("Absolute Avarice - Mystery Encounter", () => { expect(enemyField.length).toBe(1); expect(enemyField[0].species.speciesId).toBe(Species.GREEDENT); const moveset = enemyField[0].moveset.map(m => m.moveId); - expect(moveset?.length).toBe(4); expect(moveset).toEqual([Moves.THRASH, Moves.CRUNCH, Moves.BODY_PRESS, Moves.SLACK_OFF]); const movePhases = phaseSpy.mock.calls.filter(p => p[0] instanceof MovePhase).map(p => p[0]); diff --git a/test/mystery-encounter/mystery-encounter-utils.test.ts b/test/mystery-encounter/mystery-encounter-utils.test.ts index c22d3d628a2..d0189c3604c 100644 --- a/test/mystery-encounter/mystery-encounter-utils.test.ts +++ b/test/mystery-encounter/mystery-encounter-utils.test.ts @@ -51,7 +51,9 @@ describe("Mystery Encounter Utils", () => { game.override.seed("random"); let result = getRandomPlayerPokemon(); - expect(result.species.speciesId).toBe(Species.MANAPHY).seed("random2"); + expect(result.species.speciesId).toBe(Species.MANAPHY); + + game.override.seed("random2"); result = getRandomPlayerPokemon(); expect(result.species.speciesId).toBe(Species.ARCEUS); @@ -69,7 +71,9 @@ describe("Mystery Encounter Utils", () => { game.override.seed("random"); let result = getRandomPlayerPokemon(); - expect(result.species.speciesId).toBe(Species.MANAPHY).seed("random2"); + expect(result.species.speciesId).toBe(Species.MANAPHY); + + game.override.seed("random2"); result = getRandomPlayerPokemon(); expect(result.species.speciesId).toBe(Species.ARCEUS); @@ -86,7 +90,9 @@ describe("Mystery Encounter Utils", () => { game.override.seed("random"); let result = getRandomPlayerPokemon(true); - expect(result.species.speciesId).toBe(Species.MANAPHY).seed("random2"); + expect(result.species.speciesId).toBe(Species.MANAPHY); + + game.override.seed("random2"); result = getRandomPlayerPokemon(true); expect(result.species.speciesId).toBe(Species.MANAPHY); @@ -103,7 +109,9 @@ describe("Mystery Encounter Utils", () => { game.override.seed("random"); let result = getRandomPlayerPokemon(true, false); - expect(result.species.speciesId).toBe(Species.MANAPHY).seed("random2"); + expect(result.species.speciesId).toBe(Species.MANAPHY); + + game.override.seed("random2"); result = getRandomPlayerPokemon(true, false); expect(result.species.speciesId).toBe(Species.MANAPHY); @@ -120,7 +128,9 @@ describe("Mystery Encounter Utils", () => { game.override.seed("random"); let result = getRandomPlayerPokemon(true, false, true); - expect(result.species.speciesId).toBe(Species.ARCEUS).seed("random2"); + expect(result.species.speciesId).toBe(Species.ARCEUS); + + game.override.seed("random2"); result = getRandomPlayerPokemon(true, false, true); expect(result.species.speciesId).toBe(Species.ARCEUS); @@ -240,6 +250,7 @@ describe("Mystery Encounter Utils", () => { it("gets species of specified types", () => { // Only 9 tiers are: Kyogre, Groudon, Rayquaza, Arceus, Zacian, Koraidon, Miraidon, Terapagos + // TODO: This has to be changed const result = getRandomSpeciesByStarterCost(9, undefined, [PokemonType.GROUND]); const pokeSpecies = getPokemonSpecies(result); expect(pokeSpecies.speciesId).toBe(Species.GROUDON); diff --git a/test/testUtils/helpers/moveHelper.ts b/test/testUtils/helpers/moveHelper.ts index b3cdffeb636..07e17ef988b 100644 --- a/test/testUtils/helpers/moveHelper.ts +++ b/test/testUtils/helpers/moveHelper.ts @@ -20,6 +20,7 @@ export class MoveHelper extends GameManagerHelper { /** * Intercepts {@linkcode MoveEffectPhase} and mocks the phase's move's * accuracy to -1, guaranteeing a hit. + * @returns A promise that resolves once the next MoveEffectPhase has been reached (not run). */ public async forceHit(): Promise { await this.game.phaseInterceptor.to(MoveEffectPhase, false); @@ -30,7 +31,8 @@ export class MoveHelper extends GameManagerHelper { /** * Intercepts {@linkcode MoveEffectPhase} and mocks the phase's move's accuracy * to 0, guaranteeing a miss. - * @param firstTargetOnly - Whether the move should force miss on the first target only, in the case of multi-target moves. + * @param firstTargetOnly - Whether to only force a miss on the first target hit; default `false`. + * @returns A promise that resolves once the next MoveEffectPhase has been reached (not run). */ public async forceMiss(firstTargetOnly = false): Promise { await this.game.phaseInterceptor.to(MoveEffectPhase, false);