diff --git a/jam-ui/cypress/factories/session.ts b/jam-ui/cypress/factories/session.ts index 157fd5f04..690541c24 100644 --- a/jam-ui/cypress/factories/session.ts +++ b/jam-ui/cypress/factories/session.ts @@ -1,38 +1,34 @@ import { mergePartially, NestedPartial } from 'merge-partially'; import { faker } from '@faker-js/faker'; +import { IUser } from './user'; -interface User { - id: string; - name: string; -} - -interface Track { +interface ITrack { id: string; instrument: string; } -interface Participant { +interface IParticipant { id: string; client_id: string; - user: User; - tracks: Track[]; + user: IUser; + tracks: ITrack[]; } -interface Invitations { +interface IInvitations { id: string; sender_id?: string; receiver_id?: string; } -interface Session { +interface ISession { id: string; name: string; description: string; - participants?: Participant[]; - invitations?: Invitations[]; + participants?: IParticipant[]; + invitations?: IInvitations[]; } -export default function makeFakeSession(overrides?: NestedPartial): Session { +export default function makeFakeSession(overrides?: NestedPartial): ISession { return mergePartially.deep( { id: faker.string.uuid(), @@ -44,7 +40,6 @@ export default function makeFakeSession(overrides?: NestedPartial): Ses client_id: faker.string.uuid(), user: { id: faker.string.uuid(), - name: faker.person.firstName(), }, tracks: [{ id: faker.string.uuid(), diff --git a/jam-ui/cypress/factories/user.ts b/jam-ui/cypress/factories/user.ts index 248d4d60e..e52bf6f0d 100644 --- a/jam-ui/cypress/factories/user.ts +++ b/jam-ui/cypress/factories/user.ts @@ -1,20 +1,31 @@ import { mergePartially, NestedPartial } from 'merge-partially'; import { faker } from '@faker-js/faker'; -interface IUser { +export interface IUser { id: string; - firstName: string; - lastName: string; - email: string; + name?: string; + firstName?: string; + lastName?: string; + email?: string; + city?: string; + state?: string; + country?: string; + biography?: string; + online?: boolean; + musician?: boolean; + photo_url?: string; } export default function makeFakeUser(overrides?: NestedPartial): IUser { + const fname: string = faker.person.firstName(); + const lname: string = faker.person.lastName(); return mergePartially.deep( { id: faker.string.uuid(), email: faker.internet.email(), - firstName: faker.person.firstName(), - lastName: faker.person.lastName(), + firstName: fname, + lastName: lname, + name: fname + ' ' + lname, }, overrides ); diff --git a/jam-ui/src/components/sessions/JKSession.js b/jam-ui/src/components/sessions/JKSession.js index 959238cf4..58e13debc 100644 --- a/jam-ui/src/components/sessions/JKSession.js +++ b/jam-ui/src/components/sessions/JKSession.js @@ -67,7 +67,7 @@ function JKSession({ session }) { - + */} ); };