From 02f9439bd2a3c9844738b0040bd52530b55a2326 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 19 Oct 2022 19:16:21 +0200 Subject: [PATCH 1/3] correctly evaluate to false --- backend/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index b622293ad..c9543902e 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -67,7 +67,7 @@ const loginServer = { const email = { EMAIL: process.env.EMAIL === 'true' || false, - EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || 'false', + EMAIL_TEST_MODUS: process.env.EMAIL_TEST_MODUS === 'true' || false, EMAIL_TEST_RECEIVER: process.env.EMAIL_TEST_RECEIVER || 'stage1@gradido.net', EMAIL_USERNAME: process.env.EMAIL_USERNAME || 'gradido_email', EMAIL_SENDER: process.env.EMAIL_SENDER || 'info@gradido.net', From e9f40bc63811766d98d3eab0ebb55710fe1a982d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 20 Oct 2022 09:47:59 +0200 Subject: [PATCH 2/3] fix unit test --- backend/src/mailer/sendEMail.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/sendEMail.test.ts b/backend/src/mailer/sendEMail.test.ts index a6f4bb62a..5746f1ead 100644 --- a/backend/src/mailer/sendEMail.test.ts +++ b/backend/src/mailer/sendEMail.test.ts @@ -73,7 +73,7 @@ describe('sendEMail', () => { it('calls sendMail of transporter', () => { expect((createTransport as jest.Mock).mock.results[0].value.sendMail).toBeCalledWith({ from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`, - to: `${CONFIG.EMAIL_TEST_RECEIVER}`, + to: 'receiver@mail.org', cc: 'support@gradido.net', subject: 'Subject', text: 'Text text text', From 39df2a4e96c35351fdfb480ad8613abf3072bccc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 20 Oct 2022 10:21:39 +0200 Subject: [PATCH 3/3] test send email with test modus true --- backend/src/mailer/sendEMail.test.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/backend/src/mailer/sendEMail.test.ts b/backend/src/mailer/sendEMail.test.ts index 5746f1ead..8e3b0c4a2 100644 --- a/backend/src/mailer/sendEMail.test.ts +++ b/backend/src/mailer/sendEMail.test.ts @@ -29,6 +29,7 @@ describe('sendEMail', () => { let result: boolean describe('config email is false', () => { beforeEach(async () => { + jest.clearAllMocks() result = await sendEMail({ to: 'receiver@mail.org', cc: 'support@gradido.net', @@ -48,6 +49,7 @@ describe('sendEMail', () => { describe('config email is true', () => { beforeEach(async () => { + jest.clearAllMocks() CONFIG.EMAIL = true result = await sendEMail({ to: 'receiver@mail.org', @@ -84,4 +86,28 @@ describe('sendEMail', () => { expect(result).toBeTruthy() }) }) + + describe('with email EMAIL_TEST_MODUS true', () => { + beforeEach(async () => { + jest.clearAllMocks() + CONFIG.EMAIL = true + CONFIG.EMAIL_TEST_MODUS = true + result = await sendEMail({ + to: 'receiver@mail.org', + cc: 'support@gradido.net', + subject: 'Subject', + text: 'Text text text', + }) + }) + + it('calls sendMail of transporter with faked to', () => { + expect((createTransport as jest.Mock).mock.results[0].value.sendMail).toBeCalledWith({ + from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`, + to: CONFIG.EMAIL_TEST_RECEIVER, + cc: 'support@gradido.net', + subject: 'Subject', + text: 'Text text text', + }) + }) + }) })