diff --git a/filtrage.js b/filtrage.js index 4993f10c43bf4d456fe8fafaa807e100987dc026..86d57b2ef00324214468e870dc36d2da564d39b9 100644 --- a/filtrage.js +++ b/filtrage.js @@ -1,25 +1,4 @@ -import {fetchPokemonList} from './pokemonProvider.js'; - -function getPokemons(pokemons) { - const list = pokemons; - console.log(list); +function filterPokemons(pokemons) { + return pokemons.filter(pokemon => pokemon.weight > 3 && pokemon.height < 1); } - - -/** -* Filter Pokémon with weight > 3kg and height < 1m -*/ -function filterPokemons() { - fetchPokemonList((pokemons) => { - const filteredPokemons = pokemons.filter(pokemon => pokemon.weight > 3 ); - displayPokemons(filteredPokemons); - }, 318); // Fetch 318 Pokémon -} -function filterPokemons2() { - fetchPokemonList((pokemons) => { - const filteredPokemons = pokemons.filter(pokemon => pokemon.height < 1 ); - displayPokemons(filteredPokemons); - }, 318); // Fetch 318 Pokémon -} - -fetchPokemonList(getPokemons, 20); \ No newline at end of file +module.exports = filterPokemons; \ No newline at end of file diff --git a/filtrage.test.js b/filtrage.test.js index eb3657ff1ad1f2d87a3af355ef30ec89395198a0..b35485e26d96d7ced648b56e496013260017e4aa 100644 --- a/filtrage.test.js +++ b/filtrage.test.js @@ -1,6 +1,19 @@ -const convert = require('./convert'); +// filterPokemons.test.js +const filterPokemons = require('./filtrage'); // Import your filter function -test('Conversion Euros to Dollars', () => { - expect(convert.convertEurToUsd(3)).toBe(3.114); -}); +test('filters Pokémon with weight > 3kg and height < 1m', () => { + const pokemons = [ + { name: 'Pikachu', weight: 6, height: 0.4 }, + { name: 'Bulbasaur', weight: 3, height: 0.7 }, + { name: 'Squirtle', weight: 4, height: 0.9 }, + { name: 'Charizard', weight: 10, height: 1.7 } + ]; + const filteredPokemons = filterPokemons(pokemons); + + // Assert that the filtered list contains only the valid Pokémon + expect(filteredPokemons).toEqual([ + { name: 'Pikachu', weight: 6, height: 0.4 }, + { name: 'Squirtle', weight: 4, height: 0.9 } + ]); +}); \ No newline at end of file diff --git a/package.json b/package.json index 7302f53bcb4e2491957d69f87ae8ba5a782179a0..cba0b8e56489ba1c2bfade06d3a8965ec38d795d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "pokemonProvider.js", "type": "module", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "jest" }, "keywords": [], "author": "",