IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3438 from gradido/backend_test_refactor_better_bun_compatibility

Browse Source 
refactor(backend): test refactor better bun compatibility
This commit is contained in:
einhornimmond 2025-02-04 18:59:32 +01:00 committed by GitHub
commit ce5990a844
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 39 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test_backend.yml vendored
View File

@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v3
- name: Backend | docker-compose mariadb
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb mailserver
run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
- name: Sleep for 30 seconds
run: sleep 30s

4
backend/src/emails/sendEmailTranslated.test.ts
View File

@ -23,11 +23,11 @@ jest.mock('nodemailer', () => {
__esModule: true,
createTransport: jest.fn(() => {
return {
sendMail: jest.fn(() => {
sendMail: () => {
return {
messageId: 'message',
}
}),
},
}
}),
}

46
backend/src/emails/sendEmailVariants.test.ts
View File

@ -11,7 +11,8 @@ import { logger, i18n as localization } from '@test/testSetup'
import { CONFIG } from '@/config'
import { sendEmailTranslated } from './sendEmailTranslated'
// eslint-disable-next-line import/no-namespace
import * as sendEmailTranslatedApi from './sendEmailTranslated'
import {
sendAddedContributionMessageEmail,
sendAccountActivationEmail,
@ -34,6 +35,21 @@ CONFIG.EMAIL_SMTP_HOST = testMailServerHost
CONFIG.EMAIL_SMTP_PORT = testMailServerPort
CONFIG.EMAIL_TLS = testMailTLS
jest.mock('nodemailer', () => {
return {
__esModule: true,
createTransport: jest.fn(() => {
return {
sendMail: () => {
return {
messageId: 'message',
}
},
}
}),
}
})
let con: Connection
let testEnv: {
mutate: ApolloServerTestClient['mutate']
@ -50,13 +66,7 @@ afterAll(async () => {
await con.close()
})
jest.mock('./sendEmailTranslated', () => {
const originalModule = jest.requireActual('./sendEmailTranslated')
return {
__esModule: true,
sendEmailTranslated: jest.fn((a) => originalModule.sendEmailTranslated(a)),
}
})
const sendEmailTranslatedSpy = jest.spyOn(sendEmailTranslatedApi, 'sendEmailTranslated')
describe('sendEmailVariants', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@ -77,7 +87,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -131,7 +141,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -182,7 +192,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -235,7 +245,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -292,7 +302,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -348,7 +358,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -403,7 +413,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -457,7 +467,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -513,7 +523,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},
@ -572,7 +582,7 @@ describe('sendEmailVariants', () => {
describe('calls "sendEmailTranslated"', () => {
it('with expected parameters', () => {
expect(sendEmailTranslated).toBeCalledWith({
expect(sendEmailTranslatedSpy).toBeCalledWith({
receiver: {
to: 'Peter Lustig <peter@lustig.de>',
},

9
backend/src/seeds/factory/user.ts
View File

@ -18,11 +18,18 @@ export const userFactory = async (
const homeCom = await writeHomeCommunityEntry()
const response = await mutate({ mutation: createUser, variables: user })
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
if (!response?.data?.createUser) {
// eslint-disable-next-line no-console
console.log(response)
throw new Error('createUser mutation returned unexpected response')
}
const {
data: {
createUser: { id },
},
} = await mutate({ mutation: createUser, variables: user })
} = response
// get user from database
let dbUser = await User.findOneOrFail({ where: { id }, relations: ['emailContact', 'userRoles'] })