From 36ed26c42902202c4a7122720e8a81e664980fbc Mon Sep 17 00:00:00 2001 From: NiiniieB Date: Wed, 13 Feb 2019 08:45:25 +0100 Subject: [PATCH] fin --- filter-map/ex1.js | 1 + filter-map/ex2.js | 1 + filter/ex1.js | 5 +- filter/ex2.js | 1 + filter/ex3.js | 2 + filter/ex4.js | 1 + filter/ex5.js | 1 + filter/ex6.js | 13 +- map/ex1.js | 10 +- map/ex2.js | 20 +- map/ex3.js | 17 +- map/ex4.js | 10 +- map/ex5.js | 10 +- package-lock.json | 577 ++------------------------------------ tests/filter-map1.test.js | 3 +- tests/filter-map2.test.js | 2 +- tests/filter1.test.js | 2 +- tests/filter2.test.js | 2 +- tests/filter3.test.js | 2 +- tests/filter4.test.js | 2 +- tests/filter5.test.js | 2 +- tests/filter6.test.js | 2 +- tests/map1.test.js | 2 +- tests/map2.test.js | 2 +- tests/map3.test.js | 2 +- tests/map4.test.js | 2 +- tests/map5.test.js | 2 +- 27 files changed, 108 insertions(+), 588 deletions(-) diff --git a/filter-map/ex1.js b/filter-map/ex1.js index ef95fa93..a99f9f6c 100644 --- a/filter-map/ex1.js +++ b/filter-map/ex1.js @@ -23,6 +23,7 @@ Sortie attendue: */ function getJedisNames(characters) { + return characters.filter(x => x.side === "light").map(y => y.name); } module.exports = getJedisNames; diff --git a/filter-map/ex2.js b/filter-map/ex2.js index 9a2f14c8..40c76b02 100644 --- a/filter-map/ex2.js +++ b/filter-map/ex2.js @@ -25,6 +25,7 @@ Sortie attendue: */ function getCampusesTeachingReact(campuses) { + return campuses.filter(x => x.curriculums.includes('JS/React')).map(y => y.city); } module.exports = getCampusesTeachingReact; diff --git a/filter/ex1.js b/filter/ex1.js index 69ced5eb..c00f7626 100644 --- a/filter/ex1.js +++ b/filter/ex1.js @@ -12,11 +12,14 @@ Sortie attendue: */ function getPositiveNumbers(numbers) { + return numbers.filter(x =>x >= 0) + } + // Si besoin, tu peux toujours visualiser le résultat avec console.log, // mais alors, il faut alors lancer l'exercice avec node filter/ex1 -// console.log(getPositiveNumbers([-2, -1, 0, 1, 2])); +//console.log(getPositiveNumbers([7, -4, 2, 0, -10, 3, 11])); // Ne pas modifier l'export module.exports = getPositiveNumbers; diff --git a/filter/ex2.js b/filter/ex2.js index 829b90f4..3c9a2b63 100644 --- a/filter/ex2.js +++ b/filter/ex2.js @@ -16,6 +16,7 @@ Exemple d'entrée: */ function getMultiplesOf(numbers, n) { + return numbers.filter(x => x % n ===0) } // Ne pas modifier l'export diff --git a/filter/ex3.js b/filter/ex3.js index 6e20e379..644dbf6c 100644 --- a/filter/ex3.js +++ b/filter/ex3.js @@ -24,7 +24,9 @@ Sortie attendue: */ function keepStarks(names) { + return names.filter(x=>x.endsWith("Stark") ) } + // Ne pas modifier l'export module.exports = keepStarks; diff --git a/filter/ex4.js b/filter/ex4.js index cb038bc7..4afcdd48 100644 --- a/filter/ex4.js +++ b/filter/ex4.js @@ -29,6 +29,7 @@ Sortie attendue: */ function filterOnPrice(products, maxPrice) { + return products.filter(x => x.price <= maxPrice) } // Ne pas modifier l'export diff --git a/filter/ex5.js b/filter/ex5.js index e58c104d..b5f1658c 100644 --- a/filter/ex5.js +++ b/filter/ex5.js @@ -39,6 +39,7 @@ Exemple d'entrée: */ function searchWordFilter(items, search) { + return items.filter(x => x.toUpperCase().includes(search.toUpperCase())); } // Ne pas modifier l'export diff --git a/filter/ex6.js b/filter/ex6.js index ed81b883..a44744f8 100644 --- a/filter/ex6.js +++ b/filter/ex6.js @@ -5,7 +5,7 @@ des tableaux de chaînes de caractères : 1. des commentaires sur un fil d'actualité ou une vidéo. 2. une liste de mots "grossiers" ou "offensifs" à bannir -La fonction doit éliminer les commentaires contenant au moins un des mots "bannis". +La fonction doit éliminer les commentaires contenant au moins un des mots "banned". Exemple d'entrée: 1. des commentaires (on est resté soft pour ne pas heurter les oreilles chastes) @@ -26,8 +26,15 @@ Sortie attendue: */ -function filterOffensiveComments(comments, bannedWords) { -} + function filterOffensiveComments(comments, bannedWords) { + var banned; + for(var i=0;i x.toUpperCase().includes(bannedWords[i].toUpperCase())=== false); + comments = banned; + } + return banned; + } + // Ne pas modifier l'export module.exports = filterOffensiveComments; diff --git a/map/ex1.js b/map/ex1.js index e337eb79..943ab480 100644 --- a/map/ex1.js +++ b/map/ex1.js @@ -21,12 +21,14 @@ En sortie: [ */ -function getStringsLength(strings) { -} + function getStringsLength(string) { + return string.map (x=>x + ' contains '+ x.length + ' characters'); + }; + + // Si besoin, tu peux toujours visualiser le résultat avec console.log, // mais alors, il faut alors lancer l'exercice avec node map/ex1 -// console.log(getStringsLength(['Cat', 'Lion', 'Tiger', 'Jaguar', 'Leopard'])); - +console.log(getStringsLength(['Cat', 'Lion', 'Tiger', 'Jaguar', 'Leopard'])); // Ne pas modifier l'export module.exports = getStringsLength; diff --git a/map/ex2.js b/map/ex2.js index 1b77e1ff..68f98d99 100644 --- a/map/ex2.js +++ b/map/ex2.js @@ -41,11 +41,15 @@ En sortie: [ ] */ - -function getFoodCategories(foods) { -} - - - -// Ne pas modifier l'export -module.exports = getFoodCategories; +function getFoodCategories(string){ + return string.map(x=>x.isVegetarian ? x.food + ' is suitable for vegetarians': x.food +' is not suitable for vegetarians'); +}; +/*console.log(getFoodCategories([ + { food: 'Bacon', isVegetarian: false}, + { food: 'Sausage', isVegetarian: false }, + { food: 'Tofu', isVegetarian: true }, + { food: 'Chick Pea', isVegetarian: true } +])); +*/ + +module.exports = getFoodCategories; \ No newline at end of file diff --git a/map/ex3.js b/map/ex3.js index abfbd879..402a4a62 100644 --- a/map/ex3.js +++ b/map/ex3.js @@ -60,7 +60,22 @@ En sortie: */ function getMoviesFreshness(movies) { -} + return movies.map(x=>{ + if (x.rating < 60){ + x.label = 'rotten'; + } + else if (x.rating > 75){ + x.label='certified fresh'; + } + else { + x.label='fresh'; + } + return x; + } + ) +}; + + diff --git a/map/ex4.js b/map/ex4.js index 2f7f9617..18cc9956 100644 --- a/map/ex4.js +++ b/map/ex4.js @@ -52,7 +52,15 @@ Tableau de sortie correspondant (toFixed transforme les nombres en chaînes) */ function getCirclesProperties(radiuses) { -} + return radiuses.map(x=>{ + let radius = x; + let circumference =Number.parseFloat(2 * Math.PI * x).toFixed(3); + let surface = Number.parseFloat(Math.PI * x * x).toFixed(3);; + var tab = {"radius": radius , "circumference" : circumference ,"surface" : surface }; + return tab; + +}) +}; diff --git a/map/ex5.js b/map/ex5.js index faf7cee5..0c5f45a7 100644 --- a/map/ex5.js +++ b/map/ex5.js @@ -11,8 +11,16 @@ Exemple de tableau d'entrée: Tableau renvoyé par multiplyOddIndices: [3, 8, 11, 39, 19, 35] */ - function multiplyOddIndices(numbers) { + var result = numbers.map(x => { + if (numbers.indexOf(x)% 2 === 0 ){ + return x; + } else { + return x * numbers.indexOf(x); + } +}) + return result; } + module.exports = multiplyOddIndices; \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 503e064f..194c60a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -600,133 +600,6 @@ "trim-right": "^1.0.1" } }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, - "requires": { - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, "babel-helpers": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", @@ -756,15 +629,6 @@ "babel-runtime": "^6.22.0" } }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, "babel-plugin-istanbul": { "version": "4.1.6", "resolved": "http://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz", @@ -783,343 +647,12 @@ "integrity": "sha1-5h+uBaHKiAGq3uV6bWa4zvr0QWc=", "dev": true }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "http://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "http://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, "babel-plugin-syntax-object-rest-spread": { "version": "6.13.0", "resolved": "http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", "dev": true }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "^6.24.1", - "babel-plugin-syntax-async-functions": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "lodash": "^4.17.4" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, - "requires": { - "babel-helper-define-map": "^6.24.1", - "babel-helper-function-name": "^6.24.1", - "babel-helper-optimise-call-expression": "^6.24.1", - "babel-helper-replace-supers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "^6.24.1", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-types": "^6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-amd": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, - "requires": { - "babel-helper-replace-supers": "^6.24.1", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "^6.24.1", - "babel-helper-get-function-arity": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "^6.24.1", - "babel-runtime": "^6.22.0", - "regexpu-core": "^2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", - "babel-plugin-syntax-exponentiation-operator": "^6.8.0", - "babel-runtime": "^6.22.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "dev": true, - "requires": { - "regenerator-transform": "^0.10.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "^6.22.0", - "babel-plugin-syntax-trailing-function-commas": "^6.22.0", - "babel-plugin-transform-async-to-generator": "^6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", - "babel-plugin-transform-es2015-block-scoping": "^6.23.0", - "babel-plugin-transform-es2015-classes": "^6.23.0", - "babel-plugin-transform-es2015-computed-properties": "^6.22.0", - "babel-plugin-transform-es2015-destructuring": "^6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0", - "babel-plugin-transform-es2015-for-of": "^6.23.0", - "babel-plugin-transform-es2015-function-name": "^6.22.0", - "babel-plugin-transform-es2015-literals": "^6.22.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0", - "babel-plugin-transform-es2015-modules-umd": "^6.23.0", - "babel-plugin-transform-es2015-object-super": "^6.22.0", - "babel-plugin-transform-es2015-parameters": "^6.23.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0", - "babel-plugin-transform-es2015-spread": "^6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "^6.22.0", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "^6.22.0", - "babel-plugin-transform-exponentiation-operator": "^6.22.0", - "babel-plugin-transform-regenerator": "^6.22.0", - "browserslist": "^3.2.6", - "invariant": "^2.2.2", - "semver": "^5.3.0" - } - }, "babel-preset-jest": { "version": "23.2.0", "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz", @@ -1322,16 +855,6 @@ "resolve": "1.1.7" } }, - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, "bser": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", @@ -1390,12 +913,6 @@ "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", "dev": true }, - "caniuse-lite": { - "version": "1.0.30000887", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000887.tgz", - "integrity": "sha512-AHpONWuGFWO8yY9igdXH94tikM6ERS84286r0cAMAXYFtJBk76lhiMhtCxBJNBZsD6hzlvpWZ2AtbVFEkf4JQA==", - "dev": true - }, "capture-exit": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz", @@ -1764,12 +1281,6 @@ "safer-buffer": "^2.1.0" } }, - "electron-to-chromium": { - "version": "1.3.70", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.70.tgz", - "integrity": "sha512-WYMjqCnPVS5JA+XvwEnpwucJpVi2+q9cdCFpbhxgWGsCtforFBEkuP9+nCyy/wnU/0SyLcLRIeZct9ayMGcXoQ==", - "dev": true - }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", @@ -2123,12 +1634,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2143,17 +1656,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2270,7 +1786,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2282,6 +1799,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2296,6 +1814,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2303,12 +1822,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2327,6 +1848,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2407,7 +1929,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2419,6 +1942,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2540,6 +2064,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3608,15 +3133,6 @@ "integrity": "sha1-o3dq6zEekP6D+rnlM+hRAr0WQWU=", "dev": true }, - "jest-simple-reporter": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/jest-simple-reporter/-/jest-simple-reporter-0.1.0.tgz", - "integrity": "sha512-/JHKKTlit8kPaH/DEazePB8RmBAzbc0Z+iFCVkxGBN74Eh6VRE8Vesc3pzq+mE8BEk4bXFm+MKtLGkPD2m8AXw==", - "dev": true, - "requires": { - "babel-preset-env": "^1.6.1" - } - }, "jest-snapshot": { "version": "23.6.0", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.6.0.tgz", @@ -4620,29 +4136,12 @@ "util.promisify": "^1.0.0" } }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "dev": true, - "requires": { - "babel-runtime": "^6.18.0", - "babel-types": "^6.19.0", - "private": "^0.1.6" - } - }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", @@ -4662,40 +4161,6 @@ "safe-regex": "^1.1.0" } }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", diff --git a/tests/filter-map1.test.js b/tests/filter-map1.test.js index ee17fea4..bad472ed 100644 --- a/tests/filter-map1.test.js +++ b/tests/filter-map1.test.js @@ -1,6 +1,7 @@ const getJedisNames = require('../filter-map/ex1.js'); -xdescribe('map + filter - exercice 1', () => { + +describe('map + filter - exercice 1', () => { test('getJedisNames', () => { expect(getJedisNames([ diff --git a/tests/filter-map2.test.js b/tests/filter-map2.test.js index 4da7e545..1e3b212b 100644 --- a/tests/filter-map2.test.js +++ b/tests/filter-map2.test.js @@ -1,6 +1,6 @@ const getCampusesTeachingReact = require('../filter-map/ex2.js'); -xdescribe('map + filter - exercice 2', () => { +describe('map + filter - exercice 2', () => { test('getCampusesTeachingReact', () => { expect(getCampusesTeachingReact([ diff --git a/tests/filter1.test.js b/tests/filter1.test.js index 5ae77cb6..2a88e98b 100644 --- a/tests/filter1.test.js +++ b/tests/filter1.test.js @@ -1,6 +1,6 @@ const getPositiveNumbers = require('../filter/ex1.js'); -xdescribe('filter - exercice 1', () => { +describe('filter - exercice 1', () => { test('getPositiveNumbers', () => { expect(getPositiveNumbers([7, -4, 2, 0, -10, 3, 11])) diff --git a/tests/filter2.test.js b/tests/filter2.test.js index 36121852..43d39816 100644 --- a/tests/filter2.test.js +++ b/tests/filter2.test.js @@ -1,6 +1,6 @@ const getMultiplesOf = require('../filter/ex2.js'); -xdescribe('filter - exercice 2', () => { +describe('filter - exercice 2', () => { test('getMultiplesOf', () => { expect(getMultiplesOf([-12, -10, -7, -1, 5, 8, 11, 15, 20, 27], 5)) diff --git a/tests/filter3.test.js b/tests/filter3.test.js index dbb698e9..ff81ff51 100644 --- a/tests/filter3.test.js +++ b/tests/filter3.test.js @@ -1,6 +1,6 @@ const keepStarks = require('../filter/ex3.js'); -xdescribe('filter - exercice 3', () => { +describe('filter - exercice 3', () => { test('keepStarks', () => { expect(keepStarks([ diff --git a/tests/filter4.test.js b/tests/filter4.test.js index 76beb025..0fe67cb8 100644 --- a/tests/filter4.test.js +++ b/tests/filter4.test.js @@ -23,7 +23,7 @@ const products = [ } ]; -xdescribe('filter - exercice 4', () => { +describe('filter - exercice 4', () => { test('filterOnPrice (price <= 500)', () => { expect(filterOnPrice(products, 500)) diff --git a/tests/filter5.test.js b/tests/filter5.test.js index 805d9be8..c0bbf48e 100644 --- a/tests/filter5.test.js +++ b/tests/filter5.test.js @@ -1,6 +1,6 @@ const searchWordFilter = require('../filter/ex5.js'); -xdescribe('filter - exercice 5', () => { +describe('filter - exercice 5', () => { test('searchWordFilter', () => { expect(searchWordFilter([ diff --git a/tests/filter6.test.js b/tests/filter6.test.js index 7428ee7a..6a5befe4 100644 --- a/tests/filter6.test.js +++ b/tests/filter6.test.js @@ -1,6 +1,6 @@ const filterOffensiveComments = require('../filter/ex6.js'); -xdescribe('filter - exercice 6', () => { +describe('filter - exercice 6', () => { test('filterOffensiveComments', () => { expect(filterOffensiveComments([ diff --git a/tests/map1.test.js b/tests/map1.test.js index b2a436be..38f8ea1e 100644 --- a/tests/map1.test.js +++ b/tests/map1.test.js @@ -1,6 +1,6 @@ const getStringsLength = require('../map/ex1.js'); -xdescribe('map - exercice 1', () => { +describe('map - exercice 1', () => { test('getStringsLength', () => { expect(getStringsLength([ diff --git a/tests/map2.test.js b/tests/map2.test.js index 09a20471..f2701437 100644 --- a/tests/map2.test.js +++ b/tests/map2.test.js @@ -1,6 +1,6 @@ const getFoodCategories = require('../map/ex2.js'); -xdescribe('map - exercice 2', () => { +describe('map - exercice 2', () => { test('getFoodCategories', () => { expect(getFoodCategories( [ diff --git a/tests/map3.test.js b/tests/map3.test.js index 00272563..1dd01c1a 100644 --- a/tests/map3.test.js +++ b/tests/map3.test.js @@ -1,6 +1,6 @@ const getMoviesFreshness = require('../map/ex3.js'); -xdescribe('map - exercice 3', () => { +describe('map - exercice 3', () => { test('getMoviesFreshness', () => { expect(getMoviesFreshness( diff --git a/tests/map4.test.js b/tests/map4.test.js index c01a322e..d16ec82c 100644 --- a/tests/map4.test.js +++ b/tests/map4.test.js @@ -1,6 +1,6 @@ const getCirclesProperties = require('../map/ex4.js'); -xdescribe('map - exercice 4', () => { +describe('map - exercice 4', () => { test('getCirclesProperties', () => { expect(getCirclesProperties( [ diff --git a/tests/map5.test.js b/tests/map5.test.js index 67b1a351..461a28ab 100644 --- a/tests/map5.test.js +++ b/tests/map5.test.js @@ -1,6 +1,6 @@ const multiplyOddIndices = require('../map/ex5.js'); -xdescribe('map - exercice 5', () => { +describe('map - exercice 5', () => { test('multiplyOddIndices', () => { expect(multiplyOddIndices([3, 8, 11, 13, 19, 7]))