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

fix tests after merge

Browse Source
This commit is contained in:
Moriz Wahl 2022-12-13 15:49:41 +01:00
parent 98742c0db1
commit 02656ee117
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/graphql/resolver/EmailOptinCodes.test.ts
View File

@ -13,6 +13,7 @@ let testEnv: any
CONFIG.EMAIL_CODE_VALID_TIME = 1440 CONFIG.EMAIL_CODE_VALID_TIME = 1440
CONFIG.EMAIL_CODE_REQUEST_TIME = 10 CONFIG.EMAIL_CODE_REQUEST_TIME = 10
CONFIG.EMAIL = false
beforeAll(async () => { beforeAll(async () => {
testEnv = await testEnvironment() testEnv = await testEnvironment()

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

@ -25,7 +25,6 @@ import {
sendAccountMultiRegistrationEmail, sendAccountMultiRegistrationEmail,
sendResetPasswordEmail, sendResetPasswordEmail,
} from '@/emails/sendEmailVariants' } from '@/emails/sendEmailVariants'
import { activationLink } from './UserResolver'
import { contributionLinkFactory } from '@/seeds/factory/contributionLink' import { contributionLinkFactory } from '@/seeds/factory/contributionLink'
import { transactionLinkFactory } from '@/seeds/factory/transactionLink' import { transactionLinkFactory } from '@/seeds/factory/transactionLink'
import { ContributionLink } from '@model/ContributionLink' import { ContributionLink } from '@model/ContributionLink'
@ -850,13 +849,14 @@ describe('UserResolver', () => {
lastName: 'Bloxberg', lastName: 'Bloxberg',
email: 'bibi@bloxberg.de', email: 'bibi@bloxberg.de',
language: 'de', language: 'de',
resetLink: activationLink(emailContact.emailVerificationCode), resetLink: expect.any(String),
timeDurationObject: expect.objectContaining({ timeDurationObject: expect.objectContaining({
hours: expect.any(Number), hours: expect.any(Number),
minutes: expect.any(Number), minutes: expect.any(Number),
}), }),
}) })
}) })
})
describe('request reset password again', () => { describe('request reset password again', () => {
it('thows an error', async () => { it('thows an error', async () => {

2
backend/src/graphql/resolver/UserResolver.ts
View File

@ -496,7 +496,7 @@ export class UserResolver {
lastName: user.lastName, lastName: user.lastName,
email, email,
language: user.language, language: user.language,
resetLink: activationLink(dbUserContact.emailVerificationCode), resetLink: activationLink(user.emailContact.emailVerificationCode),
timeDurationObject: getTimeDurationObject(CONFIG.EMAIL_CODE_VALID_TIME), timeDurationObject: getTimeDurationObject(CONFIG.EMAIL_CODE_VALID_TIME),
}) })