From 7798a77f6d0189a9667dcce606990f6787032c3d Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Sat, 24 Sep 2022 16:02:37 +0200 Subject: [PATCH] test: import EventEmitterModule Signed-off-by: Philip Molares --- src/history/history.service.spec.ts | 3 +++ src/media/media.service.spec.ts | 3 +++ src/notes/alias.service.spec.ts | 3 +++ src/notes/notes.service.spec.ts | 3 +++ src/permissions/permissions.service.spec.ts | 5 +++-- src/realtime/websocket/websocket.gateway.spec.ts | 3 +++ src/revisions/revisions.service.spec.ts | 3 +++ test/test-setup.ts | 3 +++ 8 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/history/history.service.spec.ts b/src/history/history.service.spec.ts index 6b619b82f..3f33afeb8 100644 --- a/src/history/history.service.spec.ts +++ b/src/history/history.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getDataSourceToken, getRepositoryToken } from '@nestjs/typeorm'; import { Mock } from 'ts-mockery'; @@ -16,6 +17,7 @@ import authConfigMock from '../config/mock/auth.config.mock'; import databaseConfigMock from '../config/mock/database.config.mock'; import noteConfigMock from '../config/mock/note.config.mock'; import { NotInDBError } from '../errors/errors'; +import { eventModuleConfig } from '../events'; import { Group } from '../groups/group.entity'; import { Identity } from '../identity/identity.entity'; import { LoggerModule } from '../logger/logger.module'; @@ -89,6 +91,7 @@ describe('HistoryService', () => { noteConfigMock, ], }), + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(User)) diff --git a/src/media/media.service.spec.ts b/src/media/media.service.spec.ts index 37c4fe0d6..74787f6ca 100644 --- a/src/media/media.service.spec.ts +++ b/src/media/media.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { promises as fs } from 'fs'; @@ -17,6 +18,7 @@ import databaseConfigMock from '../config/mock/database.config.mock'; import mediaConfigMock from '../config/mock/media.config.mock'; import noteConfigMock from '../config/mock/note.config.mock'; import { ClientError, NotInDBError } from '../errors/errors'; +import { eventModuleConfig } from '../events'; import { Group } from '../groups/group.entity'; import { Identity } from '../identity/identity.entity'; import { LoggerModule } from '../logger/logger.module'; @@ -65,6 +67,7 @@ describe('MediaService', () => { LoggerModule, NotesModule, UsersModule, + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(Edit)) diff --git a/src/notes/alias.service.spec.ts b/src/notes/alias.service.spec.ts index 8138674ff..3ef295647 100644 --- a/src/notes/alias.service.spec.ts +++ b/src/notes/alias.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule, ConfigService } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { DataSource, EntityManager, Repository } from 'typeorm'; @@ -20,6 +21,7 @@ import { NotInDBError, PrimaryAliasDeletionForbiddenError, } from '../errors/errors'; +import { eventModuleConfig } from '../events'; import { Group } from '../groups/group.entity'; import { GroupsModule } from '../groups/groups.module'; import { Identity } from '../identity/identity.entity'; @@ -93,6 +95,7 @@ describe('AliasService', () => { RevisionsModule, NotesModule, RealtimeNoteModule, + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(Note)) diff --git a/src/notes/notes.service.spec.ts b/src/notes/notes.service.spec.ts index 57e19f361..f37813436 100644 --- a/src/notes/notes.service.spec.ts +++ b/src/notes/notes.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule, ConfigService } from '@nestjs/config'; +import { EventEmitter2, EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { @@ -29,6 +30,7 @@ import { ForbiddenIdError, NotInDBError, } from '../errors/errors'; +import { eventModuleConfig, NoteEvent } from '../events'; import { Group } from '../groups/group.entity'; import { GroupsModule } from '../groups/groups.module'; import { SpecialGroup } from '../groups/groups.special'; @@ -238,6 +240,7 @@ describe('NotesService', () => { registerNoteConfig(noteMockConfig), ], }), + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(Note)) diff --git a/src/permissions/permissions.service.spec.ts b/src/permissions/permissions.service.spec.ts index a88438348..2e3539cc9 100644 --- a/src/permissions/permissions.service.spec.ts +++ b/src/permissions/permissions.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule } from '@nestjs/config'; +import { EventEmitter2, EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { DataSource, EntityManager, Repository } from 'typeorm'; @@ -21,6 +22,7 @@ import { } from '../config/mock/note.config.mock'; import { NoteConfig } from '../config/note.config'; import { PermissionsUpdateInconsistentError } from '../errors/errors'; +import { eventModuleConfig, NoteEvent } from '../events'; import { Group } from '../groups/group.entity'; import { GroupsModule } from '../groups/groups.module'; import { SpecialGroup } from '../groups/groups.special'; @@ -34,7 +36,6 @@ import { import { Note } from '../notes/note.entity'; import { NotesModule } from '../notes/notes.module'; import { Tag } from '../notes/tag.entity'; -import { RealtimeNoteModule } from '../realtime/realtime-note/realtime-note.module'; import { Edit } from '../revisions/edit.entity'; import { Revision } from '../revisions/revision.entity'; import { Session } from '../users/session.entity'; @@ -110,7 +111,7 @@ describe('PermissionsService', () => { ], }), GroupsModule, - RealtimeNoteModule, + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(User)) diff --git a/src/realtime/websocket/websocket.gateway.spec.ts b/src/realtime/websocket/websocket.gateway.spec.ts index 394112c6b..f0ecca79f 100644 --- a/src/realtime/websocket/websocket.gateway.spec.ts +++ b/src/realtime/websocket/websocket.gateway.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { IncomingMessage } from 'http'; @@ -17,6 +18,7 @@ import appConfigMock from '../../config/mock/app.config.mock'; import authConfigMock from '../../config/mock/auth.config.mock'; import databaseConfigMock from '../../config/mock/database.config.mock'; import noteConfigMock from '../../config/mock/note.config.mock'; +import { eventModuleConfig } from '../../events'; import { Group } from '../../groups/group.entity'; import { Identity } from '../../identity/identity.entity'; import { LoggerModule } from '../../logger/logger.module'; @@ -110,6 +112,7 @@ describe('Websocket gateway', () => { noteConfigMock, ], }), + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(User)) diff --git a/src/revisions/revisions.service.spec.ts b/src/revisions/revisions.service.spec.ts index a9e72312b..b458f785e 100644 --- a/src/revisions/revisions.service.spec.ts +++ b/src/revisions/revisions.service.spec.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Mock } from 'ts-mockery'; @@ -16,6 +17,7 @@ import authConfigMock from '../config/mock/auth.config.mock'; import databaseConfigMock from '../config/mock/database.config.mock'; import noteConfigMock from '../config/mock/note.config.mock'; import { NotInDBError } from '../errors/errors'; +import { eventModuleConfig } from '../events'; import { Group } from '../groups/group.entity'; import { Identity } from '../identity/identity.entity'; import { LoggerModule } from '../logger/logger.module'; @@ -58,6 +60,7 @@ describe('RevisionsService', () => { noteConfigMock, ], }), + EventEmitterModule.forRoot(eventModuleConfig), ], }) .overrideProvider(getRepositoryToken(Edit)) diff --git a/test/test-setup.ts b/test/test-setup.ts index 0b94378be..6363fc61b 100644 --- a/test/test-setup.ts +++ b/test/test-setup.ts @@ -4,6 +4,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ import { ConfigModule, ConfigService } from '@nestjs/config'; +import { EventEmitterModule } from '@nestjs/event-emitter'; import { NestExpressApplication } from '@nestjs/platform-express'; import { Test, TestingModule, TestingModuleBuilder } from '@nestjs/testing'; import { TypeOrmModule, TypeOrmModuleOptions } from '@nestjs/typeorm'; @@ -30,6 +31,7 @@ import externalServicesConfigMock from '../src/config/mock/external-services.con import mediaConfigMock from '../src/config/mock/media.config.mock'; import noteConfigMock from '../src/config/mock/note.config.mock'; import { ErrorExceptionMapping } from '../src/errors/error-mapping'; +import { eventModuleConfig } from '../src/events'; import { FrontendConfigModule } from '../src/frontend-config/frontend-config.module'; import { GroupsModule } from '../src/groups/groups.module'; import { GroupsService } from '../src/groups/groups.service'; @@ -233,6 +235,7 @@ export class TestSetupBuilder { FrontendConfigModule, IdentityModule, SessionModule, + EventEmitterModule.forRoot(eventModuleConfig), ], providers: [ {