Merge branch '2632-feature-dockerfile-for-federation' of github.com:gradido/gradido into 2632-feature-dockerfile-for-federation

federation/jest.config.js

@@ -3,7 +3,12 @@ module.exports = {
   verbose: true,
   preset: 'ts-jest',
   collectCoverage: true,
-  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**', '!src/seeds/**', '!build/**'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!**/node_modules/**',
+    '!src/seeds/**',
+    '!build/**',
+  ],
   setupFiles: ['<rootDir>/test/testSetup.ts'],
   setupFilesAfterEnv: ['<rootDir>/test/extensions.ts'],
   modulePathIgnorePatterns: ['<rootDir>/build/'],

federation/src/graphql/api/1_0/resolver/TestResolver.test.ts

@@ -31,7 +31,9 @@ describe('TestResolver', () => {
     it('returns 1_0', async () => {
       await expect(query({ query: getTestQuery })).resolves.toMatchObject({
         data: {
-          api: '1_0',
+          test: {
+            api: '1_0',
+          },
         },
       })
     })

federation/src/graphql/api/1_1/resolver/TestResolver.test.ts

@@ -2,6 +2,9 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '@/server/createServer'
+import CONFIG from '@/config'
+
+CONFIG.FEDERATION_API = '1_1'
 
 let query: any
 
@@ -31,7 +34,9 @@ describe('TestResolver', () => {
     it('returns 1_1', async () => {
       await expect(query({ query: getTestQuery })).resolves.toMatchObject({
         data: {
-          api: '1_1',
+          test: {
+            api: '1_1',
+          },
         },
       })
     })

federation/src/graphql/api/2_0/resolver/TestResolver.test.ts

@@ -2,6 +2,9 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { createTestClient } from 'apollo-server-testing'
 import createServer from '@/server/createServer'
+import CONFIG from '@/config'
+
+CONFIG.FEDERATION_API = '2_0'
 
 let query: any
 
@@ -31,7 +34,9 @@ describe('TestResolver', () => {
     it('returns 2_0', async () => {
       await expect(query({ query: getTestQuery })).resolves.toMatchObject({
         data: {
-          api: '2_0',
+          test: {
+            api: '2_0',
+          },
         },
       })
     })

federation/test/helpers.test.ts

@@ -2,6 +2,8 @@ import { contributionDateFormatter } from '@test/helpers'
 
 describe('contributionDateFormatter', () => {
   it('formats the date correctly', () => {
-    expect(contributionDateFormatter(new Date('Thu Feb 29 2024 13:12:11'))).toEqual('2/29/2024')
+    expect(
+      contributionDateFormatter(new Date('Thu Feb 29 2024 13:12:11'))
+    ).toEqual('2/29/2024')
   })
 })

federation/test/helpers.ts

@@ -28,7 +28,7 @@ export const cleanDB = async () => {
 }
 
 export const testEnvironment = async (testLogger: any = logger) => {
-  const server = await createServer()
+  const server = await createServer(testLogger)
   const con = server.con
   const testClient = createTestClient(server.apollo)
   const mutate = testClient.mutate