Merge branch '1197-admin-interface-created-transactions-list' of https://github.com/gradido/gradido into 1197-admin-interface-created-transactions-list

admin/src/components/ConfirmRegisterMailFormular.spec.js

@@ -4,21 +4,17 @@ import ConfirmRegisterMailFormular from './ConfirmRegisterMailFormular.vue'
 const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue()
+const toastSuccessMock = jest.fn()
+const toastErrorMock = jest.fn()
 
 const mocks = {
-  $moment: jest.fn(() => {
-    return {
-      format: jest.fn((m) => m),
-      subtract: jest.fn(() => {
-        return {
-          format: jest.fn((m) => m),
-        }
-      }),
-    }
-  }),
   $apollo: {
     mutate: apolloMutateMock,
   },
+  $toasted: {
+    success: toastSuccessMock,
+    error: toastErrorMock,
+  },
 }
 
 const propsData = {
@@ -47,8 +43,18 @@ describe('ConfirmRegisterMailFormular', () => {
         wrapper.find('button.test-button').trigger('click')
       })
 
-      it('calls the API', () => {
+      it('calls the API with email', () => {
-        expect(apolloMutateMock).toBeCalled()
+        expect(apolloMutateMock).toBeCalledWith(
+          expect.objectContaining({
+            variables: { email: 'bob@baumeister.de' },
+          }),
+        )
+      })
+
+      it('toasts a success message', () => {
+        expect(toastSuccessMock).toBeCalledWith(
+          'Erfolgreich senden der Confirmation Link an die E-Mail des Users! bob@baumeister.de',
+        )
       })
     })
 
@@ -59,8 +65,10 @@ describe('ConfirmRegisterMailFormular', () => {
         wrapper.find('button.test-button').trigger('click')
       })
 
-      it('calls the API', () => {
+      it('toasts an error message', () => {
-        expect(apolloMutateMock).toBeCalled()
+        expect(toastErrorMock).toBeCalledWith(
+          'Fehler beim senden des confirmation link an den Benutzer: OUCH!',
+        )
       })
     })
   })

admin/src/components/ConfirmRegisterMailFormular.vue

@@ -42,13 +42,13 @@ export default {
           },
         })
         .then(() => {
-          this.$toasted.global.success(
+          this.$toasted.success(
             'Erfolgreich senden der Confirmation Link an die E-Mail des Users! ' + this.email,
           )
         })
         .catch((error) => {
-          this.$toasted.global.error(
+          this.$toasted.error(
-            'Fehler beim senden des confirmation link an den Benutzer' + error,
+            'Fehler beim senden des confirmation link an den Benutzer: ' + error.message,
           )
         })
     },

backend/src/config/index.ts

@@ -52,7 +52,7 @@ const email = {
   EMAIL_LINK_VERIFICATION:
     process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1',
   EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/vue/reset/$1',
-  RESEND_TIME: process.env.RESEND_TIME || 10,
+  RESEND_TIME: isNaN(parseInt(process.env.RESEND_TIME)) ? 10 : parseInt(process.env.RESEND_TIME),
 }
 
 const webhook = {