ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into event-master

Browse Source
This commit is contained in:
Hannes Heine 2023-05-30 15:26:22 +02:00 committed by GitHub
commit 9a9f5eaf45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/package.json
View File

@ -96,7 +96,7 @@
"xregexp": "^4.3.0" "xregexp": "^4.3.0"
}, },
"devDependencies": { "devDependencies": {
"@faker-js/faker": "5.1.0", "@faker-js/faker": "7.6.0",
"apollo-server-testing": "~2.11.0", "apollo-server-testing": "~2.11.0",
"chai": "~4.2.0", "chai": "~4.2.0",
"cucumber": "~6.0.5", "cucumber": "~6.0.5",

4
backend/src/db/factories.js
View File

@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'
import slugify from 'slug' import slugify from 'slug'
import { hashSync } from 'bcryptjs' import { hashSync } from 'bcryptjs'
import { Factory } from 'rosie' import { Factory } from 'rosie'
import faker from '@faker-js/faker' import { faker } from '@faker-js/faker'
import { getDriver, getNeode } from './neo4j' import { getDriver, getNeode } from './neo4j'
import CONFIG from '../config/index.js' import CONFIG from '../config/index.js'
import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode.js' import generateInviteCode from '../schema/resolvers/helpers/generateInviteCode.js'
@ -63,7 +63,7 @@ Factory.define('basicUser')
.option('password', '1234') .option('password', '1234')
.attrs({ .attrs({
id: uuid, id: uuid,
name: faker.name.findName, name: faker.name.fullName,
password: '1234', password: '1234',
role: 'user', role: 'user',
termsAndConditionsAgreedVersion: '0.0.1', termsAndConditionsAgreedVersion: '0.0.1',

4
backend/src/db/seed.js
View File

@ -2,7 +2,7 @@ import sample from 'lodash/sample'
import { createTestClient } from 'apollo-server-testing' import { createTestClient } from 'apollo-server-testing'
import CONFIG from '../config' import CONFIG from '../config'
import createServer from '../server' import createServer from '../server'
import faker from '@faker-js/faker' import { faker } from '@faker-js/faker'
import Factory from '../db/factories' import Factory from '../db/factories'
import { getNeode, getDriver } from '../db/neo4j' import { getNeode, getDriver } from '../db/neo4j'
import { import {
@ -173,6 +173,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
}, },
{ {
email: 'moderator@example.org', email: 'moderator@example.org',
avatar: null,
}, },
), ),
Factory.build( Factory.build(
@ -209,6 +210,7 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
}, },
{ {
email: 'dewey@example.org', email: 'dewey@example.org',
avatar: null,
}, },
), ),
Factory.build( Factory.build(

8
backend/yarn.lock
View File

@ -1088,10 +1088,10 @@
exec-sh "^0.3.2" exec-sh "^0.3.2"
minimist "^1.2.0" minimist "^1.2.0"
"@faker-js/faker@5.1.0": "@faker-js/faker@7.6.0":
version "5.1.0" version "7.6.0"
resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-5.1.0.tgz#cee1d77ada0d0dbbe77201d18b1ebabf432d9c0f" resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
integrity sha512-0VonSKh7fBCqvY+V2FLN2ZW4pR4ZtWJalWmwSaiaB7yK7y4qp8vDfuaq9QdLjf/cdZGx3M7Wc4Q+x4fZHxI21Q== integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==
"@gar/promisify@^1.1.3": "@gar/promisify@^1.1.3":
version "1.1.3" version "1.1.3"

2
package.json
View File

@ -25,7 +25,7 @@
"@babel/core": "^7.21.8", "@babel/core": "^7.21.8",
"@babel/preset-env": "^7.21.5", "@babel/preset-env": "^7.21.5",
"@babel/register": "^7.12.10", "@babel/register": "^7.12.10",
"@faker-js/faker": "5.1.0", "@faker-js/faker": "7.6.0",
"auto-changelog": "^2.3.0", "auto-changelog": "^2.3.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",