Merge branch 'BC-6850-socket-api-implementation' of github.com:hpi-sc…

…hul-cloud/schulcloud-server into BC-6850-socket-api-implementation
hpi-schul-cloud · Apr 30, 2024 · f84ea33 · f84ea33
2 parents 8471def + bdb1b23
commit f84ea33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/apps/server/src/modules/board/board-collaboration.config.ts b/apps/server/src/modules/board/board-collaboration.config.ts
@@ -1,4 +1,3 @@
-/* istanbul ignore file */
 import { Configuration } from '@hpi-schul-cloud/commons';
 
 export interface BoardCollaborationConfig {

diff --git a/apps/server/src/modules/board/board-collaboration.testing.module.ts b/apps/server/src/modules/board/board-collaboration.testing.module.ts
@@ -12,11 +12,16 @@ import { AuthenticationApiModule } from '../authentication/authentication-api.mo
 import { AuthorizationModule } from '../authorization';
 import { BoardWsApiModule } from './board-ws-api.module';
 import { BoardModule } from './board.module';
+import { config as boardCollaborationConfig } from './board-collaboration.config';
+
+const config = () => {
+	return { ...serverConfig(), ...boardCollaborationConfig() };
+};
 
 @Module({
 	imports: [
 		CoreModule,
-		ConfigModule.forRoot(createConfigModuleOptions(serverConfig)),
+		ConfigModule.forRoot(createConfigModuleOptions(config)),
 		RabbitMQWrapperModule,
 		ConsoleWriterModule,
 		MongoMemoryDatabaseModule.forRoot({