Skip to content

Commit

Permalink
Merge pull request #781 from maxwondercorn/faker-fix
Browse files Browse the repository at this point in the history
Update Fakerjs and fix dummy app user data
  • Loading branch information
maxwondercorn authored Jul 10, 2022
2 parents 774cb35 + ebd3067 commit bc4e6bf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"@ember/jquery": "^1.1.0",
"@ember/optional-features": "^1.3.0",
"@embroider/test-setup": "^1.8.3",
"@faker-js/faker": "^7.3.0",
"@glimmer/component": "^1.0.1",
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "^10.1.0",
Expand Down Expand Up @@ -84,7 +85,6 @@
"eslint": "^7.5.0",
"eslint-plugin-ember": "^8.9.2",
"eslint-plugin-node": "^11.1.0",
"faker": "^4.1.0",
"lerna-changelog": "^1.0.1",
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
Expand Down
24 changes: 12 additions & 12 deletions tests/dummy/mirage/factories/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
Create more files in this directory to define additional factories.
*/
import { Factory } from 'ember-cli-mirage';
import faker from 'faker';
import { faker } from '@faker-js/faker';

faker.locale = 'en_US';

const MATERIAL_UI_COLORS = ['#F44336', '#E91E63', '#9C27B0', '#009688', '#2196F3', '#4CAF50', '#FFC107', '#FF5722', '#607D8B'];

export default Factory.extend({
firstName: faker.name.firstName,
lastName: faker.name.firstName,
company: faker.company.companyName,
address: faker.address.streetAddress,
country: faker.address.country,
state: faker.address.state,
email: faker.internet.email,
username: faker.internet.userName,
avatar: faker.internet.avatar,
bio: faker.lorem.paragraph,
color: () => faker.random.arrayElement(MATERIAL_UI_COLORS)
firstName: () => faker.name.firstName(),
lastName: () => faker.name.firstName(),
company: () => faker.company.companyName(),
address: () => faker.address.streetAddress(),
country: () => faker.address.country(),
state: () => faker.address.state(),
email: () => faker.internet.email(),
username: () => faker.internet.userName(),
avatar: () => faker.internet.avatar(),
bio: () => faker.lorem.paragraph(),
color: () => faker.helpers.arrayElement(MATERIAL_UI_COLORS)
});
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2196,6 +2196,11 @@
broccoli-funnel "^3.0.5"
ember-cli-babel "^7.23.1"

"@faker-js/faker@^7.3.0":
version "7.3.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.3.0.tgz#a508df35ded585c4e071cb5d9d7c89623c837fae"
integrity sha512-1W0PZezq2rxlAssoWemi9gFRD8IQxvf0FPL5Km3TOmGHFG7ib0TbFBJ0yC7D/1NsxunjNTK6WjUXV8ao/mKZ5w==

"@glimmer/compiler@^0.27.0":
version "0.27.0"
resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.27.0.tgz#b24042752a53171d5cb3d9a95a29dfc0f314ed2c"
Expand Down Expand Up @@ -8555,11 +8560,6 @@ fake-xml-http-request@^2.1.1:
resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-2.1.1.tgz#279fdac235840d7a4dff77d98ec44bce9fc690a6"
integrity sha512-Kn2WYYS6cDBS5jq/voOfSGCA0TafOYAUPbEp8mUVpD/DVV5bQIDjlq+MLLvNUokkbTpjBVlLDaM5PnX+PwZMlw==

faker@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=

fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
Expand Down

0 comments on commit bc4e6bf

Please sign in to comment.