From c73d5d4628c49f494ffebd4118ccb13e21355852 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Sat, 1 Feb 2025 12:44:58 +0100 Subject: [PATCH] remove mailserver from docker test setup --- .github/workflows/test_backend.yml | 2 +- backend/src/emails/sendEmailTranslated.test.ts | 4 ++-- backend/src/emails/sendEmailVariants.test.ts | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml index 96415cfff..8d1a8e2c4 100644 --- a/.github/workflows/test_backend.yml +++ b/.github/workflows/test_backend.yml @@ -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 diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index c10c76a62..f38342985 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -23,11 +23,11 @@ jest.mock('nodemailer', () => { __esModule: true, createTransport: jest.fn(() => { return { - sendMail: jest.fn(() => { + sendMail: () => { return { messageId: 'message', } - }), + }, } }), } diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 05d450770..88cd851d2 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -35,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']