Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-08-28 12:04:28 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove |callback| in favor of |error| (#5418)

Browse Source
This commit is contained in:
Kirk Scheibelhut
2019-04-08 12:33:32 -07:00
committed by Guangcong Luo
parent e1c389a182
commit b2777f9bf6
10 changed files with 89 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/assert.js
View File

@@ -74,17 +74,17 @@ assert.holdsItem = function (pokemon, message) {
});
};
assert.trapped = function (fn, message) {
assert.trapped = function (fn, unavailable, message) {
assert.throws(
fn, /\[Invalid choice\] Can't switch: The active Pokémon is trapped/,
fn, new RegExp(`\\[${unavailable ? 'Unavailable' : 'Invalid'} choice\\] Can't switch: The active Pokémon is trapped`),
message || 'Expected active Pokemon to be trapped.');
};
assert.cantMove = function (fn, pokemon, move, message) {
assert.cantMove = function (fn, pokemon, move, unavailable, message) {
message = message || `Expected ${pokemon} to not be able to use ${move}.`;
if (pokemon && move) {
assert.throws(
fn, new RegExp(`\\[Invalid choice\\] Can't move:.*${pokemon}.*${move}`, 'i'), message);
fn, new RegExp(`\\[${unavailable ? 'Unavailable' : 'Invalid'} choice\\] Can't move:.*${pokemon}.*${move}`, 'i'), message);
} else {
assert.throws(fn, /\[Invalid choice\] Can't move:/, message);
}
@@ -96,7 +96,7 @@ assert.cantUndo = function (fn, message) {
};
assert.cantTarget = function (fn, move, message) {
assert.cantMove(fn, 'target', move, message || `Expected not to be able to choose a target for ${move}.`);
assert.cantMove(fn, 'target', move, false, message || `Expected not to be able to choose a target for ${move}.`);
};
assert.statStage = function (pokemon, statName, stage, message) {