Merge branch 'master' into 2271-Show-rejected-Contributions

CHANGELOG.md

@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.13.1](https://github.com/gradido/gradido/compare/1.13.0...1.13.1)
+
+- Fix: correctly evaluate to EMAIL_TEST_MODE to false [`#2273`](https://github.com/gradido/gradido/pull/2273)
+- Refactor: Contribution resolver logs and events [`#2231`](https://github.com/gradido/gradido/pull/2231)
+
 #### [1.13.0](https://github.com/gradido/gradido/compare/1.12.1...1.13.0)
 
+> 18 October 2022
+
+- release: Version 1.13.0 [`#2269`](https://github.com/gradido/gradido/pull/2269)
 - fix: Linked User Email in Transaction List [`#2268`](https://github.com/gradido/gradido/pull/2268)
 - concept capturing alias [`#2148`](https://github.com/gradido/gradido/pull/2148)
 - fix: 🍰 Daily Redeem Of Contribution Link [`#2265`](https://github.com/gradido/gradido/pull/2265)

admin/package.json

@@ -3,7 +3,7 @@
   "description": "Administraion Interface for Gradido",
   "main": "index.js",
   "author": "Moriz Wahl",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "license": "Apache-2.0",
   "private": false,
   "scripts": {

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-backend",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Gradido unified backend providing an API-Service for Gradido Transactions",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/backend",

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',

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',
@@ -73,7 +75,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',
@@ -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',
+      })
+    })
+  })
 })

database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido-database",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Gradido Database Tool to execute database migrations",
   "main": "src/index.ts",
   "repository": "https://github.com/gradido/gradido/database",

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-vue-gradido-wallet",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "private": true,
   "scripts": {
     "start": "node run/server.js",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gradido",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "Gradido",
   "main": "index.js",
   "repository": "git@github.com:gradido/gradido.git",