Adjust test of 'sendAddedContributionMessageEmail' in 'ContributionMessageResolver.test.ts'

backend/src/graphql/resolver/AdminResolver.test.ts

@@ -3,6 +3,7 @@
 
 import { objectValuesToArray } from '@/util/utilities'
 import { testEnvironment, resetToken, cleanDB, contributionDateFormatter } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 import { userFactory } from '@/seeds/factory/user'
 import { creationFactory } from '@/seeds/factory/creation'
 import { creations } from '@/seeds/creation/index'
@@ -44,14 +45,15 @@ import { ContributionLink as DbContributionLink } from '@entity/ContributionLink
 import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail'
 import { EventProtocol } from '@entity/EventProtocol'
 import { EventProtocolType } from '@/event/EventProtocolType'
-import { logger } from '@test/testSetup'
 
 // mock account activation email to avoid console spam
 jest.mock('@/emails/sendEmailVariants', () => {
+  const originalModule = jest.requireActual('@/emails/sendEmailVariants')
   return {
     __esModule: true,
+    ...originalModule,
     // TODO: test the call of …
-    sendAccountActivationEmail: jest.fn(),
+    sendAccountActivationEmail: jest.fn((a) => originalModule.sendAccountActivationEmail(a)),
   }
 })
 
@@ -67,7 +69,7 @@ let mutate: any, query: any, con: any
 let testEnv: any
 
 beforeAll(async () => {
-  testEnv = await testEnvironment()
+  testEnv = await testEnvironment(logger, localization)
   mutate = testEnv.mutate
   query = testEnv.query
   con = testEnv.con

backend/src/graphql/resolver/ContributionMessageResolver.test.ts

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { cleanDB, resetToken, testEnvironment } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 import { GraphQLError } from 'graphql'
 import {
   adminCreateContributionMessage,
@@ -13,12 +14,16 @@ import { listContributionMessages } from '@/seeds/graphql/queries'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import { peterLustig } from '@/seeds/users/peter-lustig'
-import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail'
+import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants'
 
-jest.mock('@/mailer/sendAddedContributionMessageEmail', () => {
+jest.mock('@/emails/sendEmailVariants', () => {
+  const originalModule = jest.requireActual('@/emails/sendEmailVariants')
   return {
     __esModule: true,
-    sendAddedContributionMessageEmail: jest.fn(),
+    ...originalModule,
+    sendAddedContributionMessageEmail: jest.fn((a) =>
+      originalModule.sendAddedContributionMessageEmail(a),
+    ),
   }
 })
 
@@ -27,7 +32,7 @@ let testEnv: any
 let result: any
 
 beforeAll(async () => {
-  testEnv = await testEnvironment()
+  testEnv = await testEnvironment(logger, localization)
   mutate = testEnv.mutate
   con = testEnv.con
   await cleanDB()
@@ -162,15 +167,13 @@ describe('ContributionMessageResolver', () => {
 
         it('calls sendAddedContributionMessageEmail', async () => {
           expect(sendAddedContributionMessageEmail).toBeCalledWith({
+            firstName: 'Bibi',
+            lastName: 'Bloxberg',
+            email: 'bibi@bloxberg.de',
+            language: 'de',
             senderFirstName: 'Peter',
             senderLastName: 'Lustig',
-            recipientFirstName: 'Bibi',
-            recipientLastName: 'Bloxberg',
-            recipientEmail: 'bibi@bloxberg.de',
-            senderEmail: 'peter@lustig.de',
             contributionMemo: 'Test env contribution',
-            message: 'Admin Test',
-            overviewURL: 'http://localhost/overview',
           })
         })
       })

backend/src/graphql/resolver/UserResolver.test.ts

@@ -2,6 +2,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
 import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers'
+import { logger, i18n as localization } from '@test/testSetup'
 import { userFactory } from '@/seeds/factory/user'
 import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg'
 import {
@@ -30,7 +31,6 @@ import { ContributionLink } from '@model/ContributionLink'
 import { TransactionLink } from '@entity/TransactionLink'
 import { EventProtocolType } from '@/event/EventProtocolType'
 import { EventProtocol } from '@entity/EventProtocol'
-import { logger, i18n as localization } from '@test/testSetup'
 import { validate as validateUUID, version as versionUUID } from 'uuid'
 import { peterLustig } from '@/seeds/users/peter-lustig'
 import { UserContact } from '@entity/UserContact'
@@ -41,10 +41,14 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister'
 // import { klicktippSignIn } from '@/apis/KlicktippController'
 
 jest.mock('@/emails/sendEmailVariants', () => {
+  const originalModule = jest.requireActual('@/emails/sendEmailVariants')
   return {
     __esModule: true,
-    sendAccountActivationEmail: jest.fn(),
-    sendAccountMultiRegistrationEmail: jest.fn(),
+    ...originalModule,
+    sendAccountActivationEmail: jest.fn((a) => originalModule.sendAccountActivationEmail(a)),
+    sendAccountMultiRegistrationEmail: jest.fn((a) =>
+      originalModule.sendAccountMultiRegistrationEmail(a),
+    ),
   }
 })
 

backend/test/testSetup.ts

@@ -1,6 +1,10 @@
+import CONFIG from '@/config'
 import { backendLogger as logger } from '@/server/logger'
 import { i18n } from '@/server/localization'
 
+CONFIG.EMAIL = true
+CONFIG.EMAIL_TEST_MODUS = false
+
 jest.setTimeout(1000000)
 
 jest.mock('@/server/logger', () => {