From e08c156acfad5122772d5c8ebf051fef143a0c63 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 29 Mar 2023 09:47:51 +0200 Subject: [PATCH] merge conflict solved --- backend/src/graphql/resolver/UserResolver.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 93dcde73c..d3c78e2af 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -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,