merge conflict solved

This commit is contained in:
Ulf Gebhardt 2023-03-29 09:47:51 +02:00
parent 1f0b07b708
commit e08c156acf
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9

View File

@ -216,7 +216,7 @@ describe('UserResolver', () => {
})
})
it('stores the EMAIL_CONFIRMATION event in the database', () => {
it('stores the EMAIL_CONFIRMATION event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.EMAIL_CONFIRMATION,
@ -363,7 +363,7 @@ describe('UserResolver', () => {
)
})
it('stores the USER_ACTIVATE_ACCOUNT event in the database', () => {
it('stores the USER_ACTIVATE_ACCOUNT event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.USER_ACTIVATE_ACCOUNT,
@ -373,7 +373,7 @@ describe('UserResolver', () => {
)
})
it('stores the USER_REGISTER_REDEEM event in the database', () => {
it('stores the USER_REGISTER_REDEEM event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.USER_REGISTER_REDEEM,
@ -955,7 +955,7 @@ describe('UserResolver', () => {
)
})
it('stores the USER_LOGIN event in the database', () => {
it('stores the USER_LOGIN event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventType.USER_LOGIN,