IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-03-14 16:08:57 +01:00
parent b3c48af3c4
commit bfa8f33ea6
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/graphql/resolver/TransactionResolver.test.ts
View File

@ -341,7 +341,7 @@ describe('send coins', () => {
memo: 'unrepeatable memo',
})
expect(DbEvent.find()).resolves.toContainEqual(
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.TRANSACTION_SEND,
affectedUserId: user[1].id,
@ -359,7 +359,7 @@ describe('send coins', () => {
memo: 'unrepeatable memo',
})
expect(DbEvent.find()).resolves.toContainEqual(
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.TRANSACTION_RECEIVE,
affectedUserId: user[0].id,

9
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -216,7 +216,7 @@ describe('UserResolver', () => {
})
})
it('stores the SEND_CONFIRMATION_EMAIL event in the database', () => {
it('stores the SEND_CONFIRMATION_EMAIL event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.SEND_CONFIRMATION_EMAIL,
@ -363,7 +363,7 @@ describe('UserResolver', () => {
)
})
it('stores the ACTIVATE_ACCOUNT event in the database', () => {
it('stores the ACTIVATE_ACCOUNT event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.ACTIVATE_ACCOUNT,
@ -373,7 +373,7 @@ describe('UserResolver', () => {
)
})
it('stores the REDEEM_REGISTER event in the database', () => {
it('stores the REDEEM_REGISTER event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.REDEEM_REGISTER,
@ -940,7 +940,7 @@ describe('UserResolver', () => {
)
})
it('stores the LOGIN event in the database', () => {
it('stores the LOGIN event in the database', async () => {
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.LOGIN,
@ -1861,7 +1861,6 @@ describe('UserResolver', () => {
{ email: 'bibi@bloxberg.de' },
{ relations: ['user'] },
)
await expect(DbEvent.find()).resolves.toContainEqual(
expect.objectContaining({
type: EventProtocolType.ADMIN_SEND_CONFIRMATION_EMAIL,