From 89baa702116153438ad25c880947b1a527c057a2 Mon Sep 17 00:00:00 2001 From: Oleg Nechiporenko Date: Tue, 12 Mar 2024 01:01:47 +0200 Subject: [PATCH] Update faker --- package.json | 2 +- tests/dummy/mirage/factories/comment.js | 2 +- tests/dummy/mirage/factories/user.js | 16 ++++++++-------- tests/helpers/f.js | 14 +++++++------- yarn.lock | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 17fe5c2c..6ec183c6 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@ember/string": "^3.1.1", "@ember/test-helpers": "^3.3.0", "@embroider/test-setup": "^3.0.3", - "@faker-js/faker": "6.3.1", + "@faker-js/faker": "^8.4.1", "@fortawesome/ember-fontawesome": "^2.0.0", "@fortawesome/free-solid-svg-icons": "^6.4.2", "@glimmer/component": "^1.1.2", diff --git a/tests/dummy/mirage/factories/comment.js b/tests/dummy/mirage/factories/comment.js index 4e411f5b..c578bd35 100644 --- a/tests/dummy/mirage/factories/comment.js +++ b/tests/dummy/mirage/factories/comment.js @@ -1,5 +1,5 @@ import { Factory } from 'miragejs'; -import faker from '@faker-js/faker'; +import { faker } from '@faker-js/faker'; const { date, lorem } = faker; diff --git a/tests/dummy/mirage/factories/user.js b/tests/dummy/mirage/factories/user.js index 22492912..69910dfb 100644 --- a/tests/dummy/mirage/factories/user.js +++ b/tests/dummy/mirage/factories/user.js @@ -1,8 +1,8 @@ import { Factory } from 'miragejs'; -import faker from '@faker-js/faker'; +import { faker } from '@faker-js/faker'; const getRandomInt = (min, max) => Math.floor(Math.random() * (max - min + 1)) + min; -const { name, random, address, datatype } = faker; +const { person, helpers, location, number } = faker; export default Factory.extend({ index(i) { @@ -10,24 +10,24 @@ export default Factory.extend({ }, 'first-name'(i) { - return `${name.firstName()}_${i + 1}`; + return `${person.firstName()}_${i + 1}`; }, 'last-name'(i) { - return `${name.lastName()}_${i + 1}`; + return `${person.lastName()}_${i + 1}`; }, age() { - return 11 + datatype.number(42); + return 11 + number.int(42); }, city() { - return address.city(); + return location.city(); }, country() { - return random.arrayElement( - faker.definitions.address.country.filter((c) => c[0] === 'B'), + return helpers.arrayElement( + faker.definitions.location.country.filter((c) => c[0] === 'B'), ); }, diff --git a/tests/helpers/f.js b/tests/helpers/f.js index 2ae4ef0a..2a560a92 100644 --- a/tests/helpers/f.js +++ b/tests/helpers/f.js @@ -1,9 +1,9 @@ -import faker from '@faker-js/faker'; +import { faker } from '@faker-js/faker'; -const firstNames = faker.definitions.name.first_name.slice(0, 10).sort(); -const lastNames = faker.definitions.name.last_name.slice(0, 10).sort(); +const firstNames = faker.definitions.person.first_name.slice(0, 10).sort(); +const lastNames = faker.definitions.person.last_name.slice(0, 10).sort(); -const { random, datatype } = faker; +const { helpers, number } = faker; // from http://stackoverflow.com/questions/14766951/convert-digits-into-words-with-javascript function numberToWord(n) { @@ -107,9 +107,9 @@ function generateContent(length) { indexWithHtml: `${i}`, someWord: numberToWord(i), id: i, - firstName: random.arrayElement(firstNames.slice(0, -2)), - lastName: random.arrayElement(lastNames.slice(0, -2)), - age: 11 + datatype.number(42), + firstName: helpers.arrayElement(firstNames.slice(0, -2)), + lastName: helpers.arrayElement(lastNames.slice(0, -2)), + age: 11 + number.int(42), rand: !!(i % 2), }); } diff --git a/yarn.lock b/yarn.lock index 8769b08f..0ae18bbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2656,10 +2656,10 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@faker-js/faker@6.3.1": - version "6.3.1" - resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-6.3.1.tgz#1ae963dd40405450a2945408cba553e1afa3e0fb" - integrity sha512-8YXBE2ZcU/pImVOHX7MWrSR/X5up7t6rPWZlk34RwZEcdr3ua6X+32pSd6XuOQRN+vbuvYNfA6iey8NbrjuMFQ== +"@faker-js/faker@^8.4.1": + version "8.4.1" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.4.1.tgz#5d5e8aee8fce48f5e189bf730ebd1f758f491451" + integrity sha512-XQ3cU+Q8Uqmrbf2e0cIC/QN43sTBSC8KF12u29Mb47tWrt2hAgBXSgpZMj4Ao8Uk0iJcU99QsOCaIL8934obCg== "@fortawesome/ember-fontawesome@^2.0.0": version "2.0.0"