From b2b38493000ba285f7034f53b93ab337f5876025 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Mon, 17 May 2021 22:28:35 +0200 Subject: [PATCH] Adjust tests to new Session and Author entities Signed-off-by: David Mehren --- src/api/private/me/history/history.controller.spec.ts | 6 ++++++ src/api/private/me/me.controller.spec.ts | 6 ++++++ src/api/private/media/media.controller.spec.ts | 8 ++++++++ src/api/private/notes/notes.controller.spec.ts | 11 ++++++++++- src/api/private/tokens/tokens.controller.spec.ts | 3 +++ src/api/public/me/me.controller.spec.ts | 6 ++++++ src/api/public/media/media.controller.spec.ts | 6 ++++++ src/api/public/notes/notes.controller.spec.ts | 10 ++++++++++ src/auth/auth.service.spec.ts | 3 +++ src/history/history.service.spec.ts | 6 ++++++ src/media/media.service.spec.ts | 6 ++++++ src/notes/notes.service.spec.ts | 6 ++++++ src/permissions/permissions.service.spec.ts | 6 ++++++ src/revisions/revisions.module.ts | 2 ++ src/revisions/revisions.service.spec.ts | 7 +++++++ 15 files changed, 91 insertions(+), 1 deletion(-) diff --git a/src/api/private/me/history/history.controller.spec.ts b/src/api/private/me/history/history.controller.spec.ts index be83cfbf7..5b5a01424 100644 --- a/src/api/private/me/history/history.controller.spec.ts +++ b/src/api/private/me/history/history.controller.spec.ts @@ -5,6 +5,8 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Author } from '../../../../authors/author.entity'; +import { Session } from '../../../../users/session.entity'; import { HistoryController } from './history.controller'; import { LoggerModule } from '../../../../logger/logger.module'; import { UsersModule } from '../../../../users/users.module'; @@ -71,6 +73,10 @@ describe('HistoryController', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) .compile(); controller = module.get(HistoryController); diff --git a/src/api/private/me/me.controller.spec.ts b/src/api/private/me/me.controller.spec.ts index f49705ffc..8e3151b74 100644 --- a/src/api/private/me/me.controller.spec.ts +++ b/src/api/private/me/me.controller.spec.ts @@ -5,6 +5,8 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Author } from '../../../authors/author.entity'; +import { Session } from '../../../users/session.entity'; import { MeController } from './me.controller'; import { UsersModule } from '../../../users/users.module'; import { LoggerModule } from '../../../logger/logger.module'; @@ -69,6 +71,10 @@ describe('MeController', () => { .useValue({}) .overrideProvider(getRepositoryToken(MediaUpload)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(MeController); diff --git a/src/api/private/media/media.controller.spec.ts b/src/api/private/media/media.controller.spec.ts index c37fb68cc..b294091cb 100644 --- a/src/api/private/media/media.controller.spec.ts +++ b/src/api/private/media/media.controller.spec.ts @@ -5,6 +5,9 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Author } from '../../../authors/author.entity'; +import { Session } from '../../../users/session.entity'; +import { UsersModule } from '../../../users/users.module'; import { MediaController } from './media.controller'; import { LoggerModule } from '../../../logger/logger.module'; import { ConfigModule } from '@nestjs/config'; @@ -47,6 +50,7 @@ describe('MediaController', () => { externalConfigMock, ], }), + UsersModule, ], controllers: [MediaController], }) @@ -72,6 +76,10 @@ describe('MediaController', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(MediaController); diff --git a/src/api/private/notes/notes.controller.spec.ts b/src/api/private/notes/notes.controller.spec.ts index e6f355b9c..393f3f592 100644 --- a/src/api/private/notes/notes.controller.spec.ts +++ b/src/api/private/notes/notes.controller.spec.ts @@ -5,6 +5,8 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Author } from '../../../authors/author.entity'; +import { Session } from '../../../users/session.entity'; import { NotesController } from './notes.controller'; import { NotesService } from '../../../notes/notes.service'; import { @@ -51,6 +53,10 @@ describe('NotesController', () => { provide: getRepositoryToken(Tag), useValue: {}, }, + { + provide: getRepositoryToken(User), + useValue: {}, + }, ], imports: [ RevisionsModule, @@ -73,7 +79,6 @@ describe('NotesController', () => { .useValue({}) .overrideProvider(getRepositoryToken(Authorship)) .useValue({}) - .overrideProvider(getRepositoryToken(User)) .useValue({}) .overrideProvider(getRepositoryToken(AuthToken)) @@ -94,6 +99,10 @@ describe('NotesController', () => { .useValue({}) .overrideProvider(getRepositoryToken(MediaUpload)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(NotesController); diff --git a/src/api/private/tokens/tokens.controller.spec.ts b/src/api/private/tokens/tokens.controller.spec.ts index 2cd958475..1a9a19cfb 100644 --- a/src/api/private/tokens/tokens.controller.spec.ts +++ b/src/api/private/tokens/tokens.controller.spec.ts @@ -5,6 +5,7 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Session } from '../../../users/session.entity'; import { TokensController } from './tokens.controller'; import { LoggerModule } from '../../../logger/logger.module'; import { getRepositoryToken } from '@nestjs/typeorm'; @@ -36,6 +37,8 @@ describe('TokensController', () => { .useValue({}) .overrideProvider(getRepositoryToken(Identity)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) .compile(); controller = module.get(TokensController); diff --git a/src/api/public/me/me.controller.spec.ts b/src/api/public/me/me.controller.spec.ts index c22965d10..fa8293d5a 100644 --- a/src/api/public/me/me.controller.spec.ts +++ b/src/api/public/me/me.controller.spec.ts @@ -10,6 +10,7 @@ import { getRepositoryToken, TypeOrmModule, } from '@nestjs/typeorm'; +import { Author } from '../../../authors/author.entity'; import { HistoryModule } from '../../../history/history.module'; import { LoggerModule } from '../../../logger/logger.module'; import { Note } from '../../../notes/note.entity'; @@ -19,6 +20,7 @@ import { Authorship } from '../../../revisions/authorship.entity'; import { Revision } from '../../../revisions/revision.entity'; import { AuthToken } from '../../../auth/auth-token.entity'; import { Identity } from '../../../users/identity.entity'; +import { Session } from '../../../users/session.entity'; import { User } from '../../../users/user.entity'; import { UsersModule } from '../../../users/users.module'; import { MeController } from './me.controller'; @@ -77,6 +79,10 @@ describe('Me Controller', () => { .useValue({}) .overrideProvider(getRepositoryToken(MediaUpload)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(MeController); diff --git a/src/api/public/media/media.controller.spec.ts b/src/api/public/media/media.controller.spec.ts index 6358c6dc2..30c75a5c5 100644 --- a/src/api/public/media/media.controller.spec.ts +++ b/src/api/public/media/media.controller.spec.ts @@ -7,6 +7,7 @@ import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { Author } from '../../../authors/author.entity'; import appConfigMock from '../../../config/mock/app.config.mock'; import mediaConfigMock from '../../../config/mock/media.config.mock'; import { LoggerModule } from '../../../logger/logger.module'; @@ -19,6 +20,7 @@ import { Authorship } from '../../../revisions/authorship.entity'; import { Revision } from '../../../revisions/revision.entity'; import { AuthToken } from '../../../auth/auth-token.entity'; import { Identity } from '../../../users/identity.entity'; +import { Session } from '../../../users/session.entity'; import { User } from '../../../users/user.entity'; import { MediaController } from './media.controller'; import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity'; @@ -63,6 +65,10 @@ describe('Media Controller', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(MediaController); diff --git a/src/api/public/notes/notes.controller.spec.ts b/src/api/public/notes/notes.controller.spec.ts index d4f31b9d9..633fc616c 100644 --- a/src/api/public/notes/notes.controller.spec.ts +++ b/src/api/public/notes/notes.controller.spec.ts @@ -10,6 +10,7 @@ import { getRepositoryToken, TypeOrmModule, } from '@nestjs/typeorm'; +import { Author } from '../../../authors/author.entity'; import { LoggerModule } from '../../../logger/logger.module'; import { Note } from '../../../notes/note.entity'; import { NotesService } from '../../../notes/notes.service'; @@ -19,6 +20,7 @@ import { Revision } from '../../../revisions/revision.entity'; import { RevisionsModule } from '../../../revisions/revisions.module'; import { AuthToken } from '../../../auth/auth-token.entity'; import { Identity } from '../../../users/identity.entity'; +import { Session } from '../../../users/session.entity'; import { User } from '../../../users/user.entity'; import { UsersModule } from '../../../users/users.module'; import { NotesController } from './notes.controller'; @@ -51,6 +53,10 @@ describe('Notes Controller', () => { provide: getRepositoryToken(Tag), useValue: {}, }, + { + provide: getRepositoryToken(User), + useValue: {}, + }, ], imports: [ RevisionsModule, @@ -95,6 +101,10 @@ describe('Notes Controller', () => { .useValue({}) .overrideProvider(getRepositoryToken(MediaUpload)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); controller = module.get(NotesController); diff --git a/src/auth/auth.service.spec.ts b/src/auth/auth.service.spec.ts index 2676328e3..3892ec2d9 100644 --- a/src/auth/auth.service.spec.ts +++ b/src/auth/auth.service.spec.ts @@ -5,6 +5,7 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Session } from '../users/session.entity'; import { AuthService } from './auth.service'; import { PassportModule } from '@nestjs/passport'; import { getRepositoryToken } from '@nestjs/typeorm'; @@ -49,6 +50,8 @@ describe('AuthService', () => { .useValue({}) .overrideProvider(getRepositoryToken(User)) .useClass(Repository) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) .compile(); service = module.get(AuthService); diff --git a/src/history/history.service.spec.ts b/src/history/history.service.spec.ts index ed5534d11..476991b19 100644 --- a/src/history/history.service.spec.ts +++ b/src/history/history.service.spec.ts @@ -5,7 +5,9 @@ */ import { Test, TestingModule } from '@nestjs/testing'; +import { Author } from '../authors/author.entity'; import { LoggerModule } from '../logger/logger.module'; +import { Session } from '../users/session.entity'; import { HistoryService } from './history.service'; import { UsersModule } from '../users/users.module'; import { NotesModule } from '../notes/notes.module'; @@ -86,6 +88,10 @@ describe('HistoryService', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); service = module.get(HistoryService); diff --git a/src/media/media.service.spec.ts b/src/media/media.service.spec.ts index 58bfcd472..32ddb4507 100644 --- a/src/media/media.service.spec.ts +++ b/src/media/media.service.spec.ts @@ -7,6 +7,7 @@ import { ConfigModule } from '@nestjs/config'; import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { Author } from '../authors/author.entity'; import mediaConfigMock from '../config/mock/media.config.mock'; import { LoggerModule } from '../logger/logger.module'; import { Note } from '../notes/note.entity'; @@ -16,6 +17,7 @@ import { Authorship } from '../revisions/authorship.entity'; import { Revision } from '../revisions/revision.entity'; import { AuthToken } from '../auth/auth-token.entity'; import { Identity } from '../users/identity.entity'; +import { Session } from '../users/session.entity'; import { User } from '../users/user.entity'; import { UsersModule } from '../users/users.module'; import { FilesystemBackend } from './backends/filesystem-backend'; @@ -77,6 +79,10 @@ describe('MediaService', () => { .useClass(Repository) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); service = module.get(MediaService); diff --git a/src/notes/notes.service.spec.ts b/src/notes/notes.service.spec.ts index 5bec3fc6c..716b302cd 100644 --- a/src/notes/notes.service.spec.ts +++ b/src/notes/notes.service.spec.ts @@ -6,12 +6,14 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; +import { Author } from '../authors/author.entity'; import { LoggerModule } from '../logger/logger.module'; import { Authorship } from '../revisions/authorship.entity'; import { Revision } from '../revisions/revision.entity'; import { RevisionsModule } from '../revisions/revisions.module'; import { AuthToken } from '../auth/auth-token.entity'; import { Identity } from '../users/identity.entity'; +import { Session } from '../users/session.entity'; import { User } from '../users/user.entity'; import { UsersModule } from '../users/users.module'; import { Note } from './note.entity'; @@ -87,6 +89,10 @@ describe('NotesService', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useClass(Repository) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); const config = module.get(ConfigService); diff --git a/src/permissions/permissions.service.spec.ts b/src/permissions/permissions.service.spec.ts index 57269e903..234c18690 100644 --- a/src/permissions/permissions.service.spec.ts +++ b/src/permissions/permissions.service.spec.ts @@ -7,6 +7,7 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { AuthToken } from '../auth/auth-token.entity'; +import { Author } from '../authors/author.entity'; import { Group } from '../groups/group.entity'; import { LoggerModule } from '../logger/logger.module'; import { Note } from '../notes/note.entity'; @@ -15,6 +16,7 @@ import { Tag } from '../notes/tag.entity'; import { Authorship } from '../revisions/authorship.entity'; import { Revision } from '../revisions/revision.entity'; import { Identity } from '../users/identity.entity'; +import { Session } from '../users/session.entity'; import { User } from '../users/user.entity'; import { UsersModule } from '../users/users.module'; import { NoteGroupPermission } from './note-group-permission.entity'; @@ -61,6 +63,10 @@ describe('PermissionsService', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); permissionsService = module.get(PermissionsService); }); diff --git a/src/revisions/revisions.module.ts b/src/revisions/revisions.module.ts index 7ecc61491..0d17971d9 100644 --- a/src/revisions/revisions.module.ts +++ b/src/revisions/revisions.module.ts @@ -6,6 +6,7 @@ import { forwardRef, Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; +import { AuthorsModule } from '../authors/authors.module'; import { LoggerModule } from '../logger/logger.module'; import { NotesModule } from '../notes/notes.module'; import { Authorship } from './authorship.entity'; @@ -19,6 +20,7 @@ import { ConfigModule } from '@nestjs/config'; forwardRef(() => NotesModule), LoggerModule, ConfigModule, + AuthorsModule, ], providers: [RevisionsService], exports: [RevisionsService], diff --git a/src/revisions/revisions.service.spec.ts b/src/revisions/revisions.service.spec.ts index 5c97c8a3c..a56e3ae6d 100644 --- a/src/revisions/revisions.service.spec.ts +++ b/src/revisions/revisions.service.spec.ts @@ -7,12 +7,15 @@ import { Test, TestingModule } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; +import { Author } from '../authors/author.entity'; +import { AuthorsModule } from '../authors/authors.module'; import { NotInDBError } from '../errors/errors'; import { LoggerModule } from '../logger/logger.module'; import { Note } from '../notes/note.entity'; import { NotesModule } from '../notes/notes.module'; import { AuthToken } from '../auth/auth-token.entity'; import { Identity } from '../users/identity.entity'; +import { Session } from '../users/session.entity'; import { User } from '../users/user.entity'; import { Authorship } from './authorship.entity'; import { Revision } from './revision.entity'; @@ -66,6 +69,10 @@ describe('RevisionsService', () => { .useValue({}) .overrideProvider(getRepositoryToken(Group)) .useValue({}) + .overrideProvider(getRepositoryToken(Session)) + .useValue({}) + .overrideProvider(getRepositoryToken(Author)) + .useValue({}) .compile(); service = module.get(RevisionsService);