From d0f3f286b935d943d27bcf6e476c8446449684e3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 11 Nov 2022 12:34:08 +0100 Subject: [PATCH 01/10] fix (frontend): Better History Messages --- .../ContributionMessagesListItem.vue | 4 ++-- .../ContributionMessages/LinkifyMessage.vue | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index 9c7a3a0f2..df0ddbc4c 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -4,14 +4,14 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('community.moderator') }} - +
diff --git a/frontend/src/components/ContributionMessages/LinkifyMessage.vue b/frontend/src/components/ContributionMessages/LinkifyMessage.vue index 09418858f..1f1e99417 100644 --- a/frontend/src/components/ContributionMessages/LinkifyMessage.vue +++ b/frontend/src/components/ContributionMessages/LinkifyMessage.vue @@ -2,6 +2,14 @@
{{ text }} + + {{ $d(new Date(text), 'short') }} +
+ + +
+ {{ text | GDD }} + {{ text }}
@@ -17,11 +25,22 @@ export default { type: String, required: true, }, + type: { + type: String, + reuired: true, + }, }, computed: { linkifiedMessage() { - const linkified = [] let string = this.message + const linkified = [] + let amount + if (this.type === 'HISTORY') { + const split = string.split(/\n\s*---\n\s*/) + string = split[1] + linkified.push({ type: 'date', text: split[0].trim() }) + amount = split[2].trim() + } let match while ((match = string.match(LINK_REGEX_PATTERN))) { if (match.index > 0) @@ -30,6 +49,7 @@ export default { string = string.substring(match.index + match[0].length) } if (string.length > 0) linkified.push({ type: 'text', text: string }) + if (amount) linkified.push({ type: 'amount', text: amount }) return linkified }, }, From 5204e16240facad4beebd709c0601cf1e37dd1b6 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Fri, 11 Nov 2022 12:41:06 +0100 Subject: [PATCH 02/10] rename component --- .../ContributionMessages/ContributionMessagesListItem.vue | 8 ++++---- .../{LinkifyMessage.vue => ParseMessage.vue} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) rename frontend/src/components/ContributionMessages/{LinkifyMessage.vue => ParseMessage.vue} (92%) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue index df0ddbc4c..5862f97f5 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.vue @@ -4,25 +4,25 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('community.moderator') }} - +
diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue index 30960bd33..53006cff5 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.vue @@ -5,23 +5,23 @@ {{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} {{ $t('moderator') }} - +
{{ message.userFirstName }} {{ message.userLastName }} {{ $d(new Date(message.createdAt), 'short') }} - +
diff --git a/admin/src/components/ContributionMessages/ParseMessage.vue b/admin/src/components/ContributionMessages/ParseMessage.vue index 2b0b72901..dc630eed2 100644 --- a/admin/src/components/ContributionMessages/ParseMessage.vue +++ b/admin/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ $n(parseFloat(text), 'decimal') }} GDD + {{ text | GDD }} {{ text }} From 16a2ffca76b0e5316b6396947e9653a128ec8d34 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sat, 12 Nov 2022 14:40:48 +0100 Subject: [PATCH 05/10] remove GDD filter --- admin/src/components/ContributionMessages/ParseMessage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/ContributionMessages/ParseMessage.vue b/admin/src/components/ContributionMessages/ParseMessage.vue index dc630eed2..069373840 100644 --- a/admin/src/components/ContributionMessages/ParseMessage.vue +++ b/admin/src/components/ContributionMessages/ParseMessage.vue @@ -8,7 +8,7 @@
- {{ text | GDD }} + {{ `${$n(Number(text), 'decimal')} GDD` }} {{ text }} From dcfab11f5e130a1c39f50a9b935ed6bbe1c798e8 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 12 Nov 2022 20:41:21 +0100 Subject: [PATCH 06/10] corrected E-Mail texts --- .../src/mailer/text/contributionConfirmed.ts | 17 +++++++------ .../text/contributionMessageReceived.ts | 8 +++---- .../src/mailer/text/contributionRejected.ts | 17 ++++++------- .../mailer/text/transactionLinkRedeemed.ts | 24 +++++++++---------- .../src/mailer/text/transactionReceived.ts | 8 +++---- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/backend/src/mailer/text/contributionConfirmed.ts b/backend/src/mailer/text/contributionConfirmed.ts index dc82d7615..106c3a4c5 100644 --- a/backend/src/mailer/text/contributionConfirmed.ts +++ b/backend/src/mailer/text/contributionConfirmed.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const contributionConfirmed = { de: { - subject: 'Schöpfung wurde bestätigt', + subject: 'Dein Gemeinwohl-Beitrag wurde bestätigt', text: (data: { senderFirstName: string senderLastName: string @@ -14,18 +14,17 @@ export const contributionConfirmed = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Dein eingereichter Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${ - data.senderFirstName - } ${data.senderLastName} bestätigt. +dein Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${ + data.senderLastName + } bestätigt und in deinem Gradido-Konto gutgeschrieben. Betrag: ${data.contributionAmount.toFixed(2).replace('.', ',')} GDD +Link zu deinem Konto: ${data.overviewURL} + Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, -dein Gradido-Team - - -Link zu deinem Konto: ${data.overviewURL}`, +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index af1cabb9f..71f16b2cd 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -1,6 +1,6 @@ export const contributionMessageReceived = { de: { - subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu Deinem Gemeinwohl-Beitrag', text: (data: { senderFirstName: string senderLastName: string @@ -14,15 +14,15 @@ export const contributionMessageReceived = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -du hast soeben zu deinem eingereichten Gemeinwohl-Beitrag "${data.contributionMemo}" eine Rückfrage von ${data.senderFirstName} ${data.senderLastName} erhalten. +du hast zu deinem Gemeinwohl-Beitrag "${data.contributionMemo}" eine Nachricht von ${data.senderFirstName} ${data.senderLastName} erhalten. -Bitte beantworte die Rückfrage in deinem Gradido-Konto im Menü "Gemeinschaft" im Tab "Meine Beiträge zum Gemeinwohl"! +Um die Nachricht zu sehen und darauf zu antworten, gehe in deinem Gradido-Konto ins Menü "Gemeinschaft" auf den Tab "Meine Beiträge zum Gemeinwohl"! Link zu deinem Konto: ${data.overviewURL} Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, +Liebe Grüße dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/contributionRejected.ts b/backend/src/mailer/text/contributionRejected.ts index a101e7a25..ff52c7b5a 100644 --- a/backend/src/mailer/text/contributionRejected.ts +++ b/backend/src/mailer/text/contributionRejected.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const contributionRejected = { de: { - subject: 'Schöpfung wurde abgelehnt', + subject: 'Dein Gemeinwohl-Beitrag wurde abgelehnt', text: (data: { senderFirstName: string senderLastName: string @@ -14,14 +14,15 @@ export const contributionRejected = { }): string => `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Dein eingereichter Gemeinwohl-Beitrag "${data.contributionMemo}" wurde soeben von ${data.senderFirstName} ${data.senderLastName} abgelehnt. - +dein Gemeinwohl-Beitrag "${data.contributionMemo}" wurde von ${data.senderFirstName} ${data.senderLastName} abgelehnt. + +Um deine Gemeinwohl-Beiträge und dazugehörige Nachrichten zu sehen, gehe in deinem Gradido-Konto ins Menü "Gemeinschaft" auf den Tab "Meine Beiträge zum Gemeinwohl"! + +Link zu deinem Konto: ${data.overviewURL} + Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, -dein Gradido-Team - - -Link zu deinem Konto: ${data.overviewURL}`, +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/transactionLinkRedeemed.ts b/backend/src/mailer/text/transactionLinkRedeemed.ts index 4d8e89cae..a63e5d275 100644 --- a/backend/src/mailer/text/transactionLinkRedeemed.ts +++ b/backend/src/mailer/text/transactionLinkRedeemed.ts @@ -14,20 +14,20 @@ export const transactionLinkRedeemed = { memo: string overviewURL: string }): string => - `Hallo ${data.recipientFirstName} ${data.recipientLastName} + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, - ${data.senderFirstName} ${data.senderLastName} (${ +${data.senderFirstName} ${data.senderLastName} (${ data.senderEmail }) hat soeben deinen Link eingelöst. - - Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD, - Memo: ${data.memo} - - Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} - - Bitte antworte nicht auf diese E-Mail! - - Mit freundlichen Grüßen, - dein Gradido-Team`, + +Betrag: ${data.amount.toFixed(2).replace('.', ',')} GDD, +Memo: ${data.memo} + +Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} + +Bitte antworte nicht auf diese E-Mail! + +Liebe Grüße +dein Gradido-Team`, }, } diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts index ba61ae680..67758c0e1 100644 --- a/backend/src/mailer/text/transactionReceived.ts +++ b/backend/src/mailer/text/transactionReceived.ts @@ -2,7 +2,7 @@ import Decimal from 'decimal.js-light' export const transactionReceived = { de: { - subject: 'Gradido Überweisung', + subject: 'Du hast Gradidos erhalten', text: (data: { senderFirstName: string senderLastName: string @@ -13,9 +13,9 @@ export const transactionReceived = { amount: Decimal overviewURL: string }): string => - `Hallo ${data.recipientFirstName} ${data.recipientLastName} + `Hallo ${data.recipientFirstName} ${data.recipientLastName}, -Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${ +du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${ data.senderLastName } (${data.senderEmail}) erhalten. @@ -23,7 +23,7 @@ Details zur Transaktion findest du in deinem Gradido-Konto: ${data.overviewURL} Bitte antworte nicht auf diese E-Mail! -Mit freundlichen Grüßen, +Liebe Grüße dein Gradido-Team`, }, } From 1b40d6aaeebff2091f3c563a82f53051fd1c0ed3 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sun, 13 Nov 2022 13:18:41 +0100 Subject: [PATCH 07/10] unit tests for HISTORY type contribution messages --- .../ContributionMessagesListItem.spec.js | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js index 2dc9fb3ce..1a918747f 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js @@ -5,9 +5,11 @@ import ContributionMessagesListItem from './ContributionMessagesListItem.vue' const localVue = global.localVue let wrapper +const dateMock = jest.fn((d) => d) + const mocks = { $t: jest.fn((t) => t), - $d: jest.fn((d) => d), + $d: dateMock, $store: { state: { firstName: 'Peter', @@ -239,4 +241,63 @@ and here is the link to the repository: https://github.com/gradido/gradido`) }) }) }) + + describe('contribution message type HISTORY', () => { + const propsData = { + message: { + id: 111, + message: `Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time) +--- +This message also contains a link: https://gradido.net/de/ +--- +350.00`, + createdAt: '2022-08-29T12:23:27.000Z', + updatedAt: null, + type: 'HISTORY', + userFirstName: 'Peter', + userLastName: 'Lustig', + userId: 107, + __typename: 'ContributionMessage', + }, + } + + const itemWrapper = () => { + return mount(ContributionMessagesListItem, { + localVue, + mocks, + propsData, + }) + } + + let messageField + + describe('render HISTORY message', () => { + beforeEach(() => { + jest.clearAllMocks() + wrapper = itemWrapper() + messageField = wrapper.find('div.is-not-moderator.text-right > div:nth-child(4)') + }) + + it('renders the date', () => { + expect(dateMock).toBeCalledWith( + new Date('Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time'), + 'short', + ) + }) + + it('renders the amount', () => { + expect(messageField.text()).toContain('350.00 GDD') + }) + + it('contains the link as text', () => { + expect(messageField.text()).toContain( + 'This message also contains a link: https://gradido.net/de/', + ) + }) + + it('contains a link to the given address', () => { + expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/') + }) + }) + }) }) From 0cb318907398c1a806cb57bd2f1e495a818c5eba Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Sun, 13 Nov 2022 13:24:00 +0100 Subject: [PATCH 08/10] unit tests for HISTORY type contribution messages --- .../ContributionMessagesListItem.spec.js | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js index c1a4e65c6..1b4f963e8 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js @@ -3,12 +3,16 @@ import ContributionMessagesListItem from './ContributionMessagesListItem.vue' const localVue = global.localVue +const dateMock = jest.fn((d) => d) +const numberMock = jest.fn((n) => n) + describe('ContributionMessagesListItem', () => { let wrapper const mocks = { $t: jest.fn((t) => t), - $d: jest.fn((d) => d), + $d: dateMock, + $n: numberMock, } describe('if message author has moderator role', () => { @@ -189,4 +193,64 @@ and here is the link to the repository: https://github.com/gradido/gradido`) }) }) }) + + describe('contribution message type HISTORY', () => { + const propsData = { + message: { + id: 111, + message: `Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time) +--- +This message also contains a link: https://gradido.net/de/ +--- +350.00`, + createdAt: '2022-08-29T12:23:27.000Z', + updatedAt: null, + type: 'HISTORY', + userFirstName: 'Peter', + userLastName: 'Lustig', + userId: 107, + __typename: 'ContributionMessage', + }, + } + + const itemWrapper = () => { + return mount(ContributionMessagesListItem, { + localVue, + mocks, + propsData, + }) + } + + let messageField + + describe('render HISTORY message', () => { + beforeEach(() => { + jest.clearAllMocks() + wrapper = itemWrapper() + messageField = wrapper.find('div.is-not-moderator.text-left > div:nth-child(4)') + }) + + it('renders the date', () => { + expect(dateMock).toBeCalledWith( + new Date('Sun Nov 13 2022 13:05:48 GMT+0100 (Central European Standard Time'), + 'short', + ) + }) + + it('renders the amount', () => { + expect(numberMock).toBeCalledWith(350, 'decimal') + expect(messageField.text()).toContain('350 GDD') + }) + + it('contains the link as text', () => { + expect(messageField.text()).toContain( + 'This message also contains a link: https://gradido.net/de/', + ) + }) + + it('contains a link to the given address', () => { + expect(messageField.find('a').attributes('href')).toBe('https://gradido.net/de/') + }) + }) + }) }) From f65cb9c5864e7277c00d8b3f2ac8d49a29624fd4 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 13 Nov 2022 14:21:27 +0100 Subject: [PATCH 09/10] missing change, `deinem` not with capital letter --- backend/src/mailer/text/contributionMessageReceived.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/mailer/text/contributionMessageReceived.ts b/backend/src/mailer/text/contributionMessageReceived.ts index 71f16b2cd..301ebef22 100644 --- a/backend/src/mailer/text/contributionMessageReceived.ts +++ b/backend/src/mailer/text/contributionMessageReceived.ts @@ -1,6 +1,6 @@ export const contributionMessageReceived = { de: { - subject: 'Nachricht zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu deinem Gemeinwohl-Beitrag', text: (data: { senderFirstName: string senderLastName: string From b8c1a9d477a6b2f7c0292c56afe86d28fba63f8d Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sun, 13 Nov 2022 14:21:33 +0100 Subject: [PATCH 10/10] fixed tests --- backend/src/mailer/sendAddedContributionMessageEmail.test.ts | 4 ++-- backend/src/mailer/sendContributionConfirmedEmail.test.ts | 4 ++-- backend/src/mailer/sendContributionRejectedEmail.test.ts | 4 ++-- backend/src/mailer/sendTransactionReceivedEmail.test.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts index bed8f6214..9a2ec1aa1 100644 --- a/backend/src/mailer/sendAddedContributionMessageEmail.test.ts +++ b/backend/src/mailer/sendAddedContributionMessageEmail.test.ts @@ -26,12 +26,12 @@ describe('sendAddedContributionMessageEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Bibi Bloxberg `, - subject: 'Rückfrage zu Deinem Gemeinwohl-Beitrag', + subject: 'Nachricht zu deinem Gemeinwohl-Beitrag', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining('Peter Lustig') && expect.stringContaining( - 'Du hast soeben zu deinem eingereichten Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Rückfrage von Peter Lustig erhalten.', + 'du hast zu deinem Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" eine Nachricht von Peter Lustig erhalten.', ) && expect.stringContaining('Was für ein Besen ist es geworden?') && expect.stringContaining('http://localhost/overview'), diff --git a/backend/src/mailer/sendContributionConfirmedEmail.test.ts b/backend/src/mailer/sendContributionConfirmedEmail.test.ts index 1935144fd..bd89afa69 100644 --- a/backend/src/mailer/sendContributionConfirmedEmail.test.ts +++ b/backend/src/mailer/sendContributionConfirmedEmail.test.ts @@ -26,11 +26,11 @@ describe('sendContributionConfirmedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: 'Bibi Bloxberg ', - subject: 'Schöpfung wurde bestätigt', + subject: 'Dein Gemeinwohl-Beitrag wurde bestätigt', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining( - 'Dein Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben bestätigt.', + 'dein Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben von Peter Lustig bestätigt und in deinem Gradido-Konto gutgeschrieben.', ) && expect.stringContaining('Betrag: 200,00 GDD') && expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), diff --git a/backend/src/mailer/sendContributionRejectedEmail.test.ts b/backend/src/mailer/sendContributionRejectedEmail.test.ts index fb044692b..be41ff15f 100644 --- a/backend/src/mailer/sendContributionRejectedEmail.test.ts +++ b/backend/src/mailer/sendContributionRejectedEmail.test.ts @@ -26,11 +26,11 @@ describe('sendContributionConfirmedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: 'Bibi Bloxberg ', - subject: 'Schöpfung wurde abgelehnt', + subject: 'Dein Gemeinwohl-Beitrag wurde abgelehnt', text: expect.stringContaining('Hallo Bibi Bloxberg') && expect.stringContaining( - 'Dein Gradido Schöpfungsantrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde soeben von Peter Lustig abgelehnt.', + 'dein Gemeinwohl-Beitrag "Vielen herzlichen Dank für den neuen Hexenbesen!" wurde von Peter Lustig abgelehnt.', ) && expect.stringContaining('Link zu deinem Konto: http://localhost/overview'), }) diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts index 9f2ba9938..ca813c033 100644 --- a/backend/src/mailer/sendTransactionReceivedEmail.test.ts +++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts @@ -26,7 +26,7 @@ describe('sendTransactionReceivedEmail', () => { it('calls sendEMail', () => { expect(sendEMail).toBeCalledWith({ to: `Peter Lustig `, - subject: 'Gradido Überweisung', + subject: 'Du hast Gradidos erhalten', text: expect.stringContaining('Hallo Peter Lustig') && expect.stringContaining('42,00 GDD') &&