mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
merge conflict solved
This commit is contained in:
parent
1f0b07b708
commit
e08c156acf
@ -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(
|
await expect(DbEvent.find()).resolves.toContainEqual(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
type: EventType.EMAIL_CONFIRMATION,
|
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(
|
await expect(DbEvent.find()).resolves.toContainEqual(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
type: EventType.USER_ACTIVATE_ACCOUNT,
|
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(
|
await expect(DbEvent.find()).resolves.toContainEqual(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
type: EventType.USER_REGISTER_REDEEM,
|
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(
|
await expect(DbEvent.find()).resolves.toContainEqual(
|
||||||
expect.objectContaining({
|
expect.objectContaining({
|
||||||
type: EventType.USER_LOGIN,
|
type: EventType.USER_LOGIN,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user